Regenerate PO(T) files

203 files changed, 26506 insertions, 9542 deletions

diff --git a/po/el/administrivia.po b/po/el/administrivia.po
index 229334fa4..d9bb81519 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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 b04002bea..41e359c57 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -31,13 +31,19 @@ msgstr "Οδηγός Εγκατάστασης &debian-gnu;"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Το κείμενο αυτό περιέχει οδηγίες για το σύστημα &debian-gnu; &release; για "
 "την αρχιτεκτονική  &arch-title; (<quote>&architecture;</quote>). Περιέχει "
@@ -46,17 +52,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>δισκέττες εκκίνησης</"
diff --git a/po/el/boot-installer.po b/po/el/boot-installer.po
index 0345ec2f7..186501200 100644
--- a/po/el/boot-installer.po
+++ b/po/el/boot-installer.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-installer\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-13 10:25+0300\n"
 "Last-Translator: debian-l10n-greek <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -118,10 +118,16 @@ msgstr "Εκκίνηση από CD-ROM"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -155,9 +161,15 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
 #: boot-installer.xml:1488 boot-installer.xml:1850
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -256,10 +268,34 @@ msgstr "Μέσω του δικτύουχρησιμοποιώντας Linux/Unix"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -362,12 +398,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, no-c-format
+#, fuzzy, 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 "
 "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> "
+"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:"
@@ -989,10 +1033,24 @@ msgstr "Η οθόνη εκκίνησης"
 
 #. Tag: para
 #: boot-installer.xml:715
-#, no-c-format
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1175,16 +1233,27 @@ msgstr "Περιεχόμενα CD"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
 msgstr ""
 "Υπάρχουν τρεις βασικές παραλλαγές CD της εγκατάστασης του Debian. Το "
@@ -1227,9 +1296,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1402,10 +1478,14 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:986
-#, no-c-format
+#, fuzzy, 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 "
+"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 που θα "
@@ -1420,11 +1500,16 @@ msgstr "Επιλογή 2: Εκκίνηση από το κέλυφος του EFI
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "Αν, για κάποιο λόγο, η επιλογή 1 δεν είναι επιτυχής επανεκκινήστε το "
@@ -1507,9 +1592,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1692,11 +1783,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "Πατήστε <command>ENTER</command>.  Αυτό θα φορτώσει και θα ξεκινήσει τον "
 "πυρήνα. Ο πυρήνας θα εμφανίσει τα συνηθισμένα μηνύματα εκκίνησης "
@@ -1879,13 +1974,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "Ο φορτωτής εκκίνησης θα εμφανίσει το προτρεπτικό του μετά το κατέβασμα και "
 "την επεξεργασία του αρχείου ρυθμίσεων. Στο σημείο αυτό η διαδικασία της "
@@ -1901,13 +2002,22 @@ msgstr "Εκκίνηση SGI Indy με TFTP"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -2099,9 +2209,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2206,7 +2322,28 @@ msgstr "Εκκίνηση ενός NewWorld Mac από το OpenFirmware"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -2225,7 +2362,7 @@ msgid ""
 "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."
+"userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
 "Θα έχετε ήδη τοποθετήσει τα αρχεία <filename>vmlinux</filename>, "
 "<filename>initrd.gz</filename>, <filename>yaboot</filename>, και "
@@ -2869,8 +3006,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Παράμετροι του Εγκαταστάτη του Debian"
 
 #. Tag: para
@@ -3077,9 +3215,13 @@ msgstr "INSTALL_MEDIA_DEV "
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -3270,12 +3412,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 "Ορίσετε την τιμή σε <userinput>true</userinput> για να ενεργοποιήσετε την "
 "υποστήριξη (επίσης ονομαζόμενη και ATA RAID, BIOS RAID ή ψευδο-RAID) δίσκων "
@@ -3642,14 +3790,21 @@ msgstr "mirror/protocol (protocol) "
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "Εξ' ορισμού ο εγκαταστάτης θα χρησιμοποιήσει το πρωτόκολλο http για το "
 "κατέβασμα των αρχείων από τους καθρέφτες του Debian και η αλλαγή αυτής της "
@@ -4157,10 +4312,13 @@ msgstr "Αξιοπιστία των δισκετών"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "Το μεγαλύτερο πρόβλημα γι' αυτους που εγκαθιστούν Debian για πρώτη φορά "
 "φαίνεται να είναι η αξιοπιστία των δισκετών."
@@ -4688,14 +4846,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "Αν έχετε ένα σύστημα Debian που ήδη λειτουργεί, ο ευκολότερος τρόπος για να "
 "στείλετε μια αναφορά εγκατάστασης είναι να εγκαταστήσετε τα πακέτα "
diff --git a/po/el/boot-new.po b/po/el/boot-new.po
index 6dc0aa8b6..fb2120056 100644
--- a/po/el/boot-new.po
+++ b/po/el/boot-new.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-new\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-08-17 15:27+0300\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -24,8 +24,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "Μπαίνοντας στο καινούριο σας σύστημα Debian"
 
 #. Tag: title
@@ -58,8 +59,8 @@ 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -73,11 +74,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -93,13 +101,25 @@ 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 "
+#, fuzzy, 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 "
+"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 "
@@ -605,11 +625,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/el/hardware.po b/po/el/hardware.po
index 23eb2df47..47966fb0f 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-01-16 16:33+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -28,10 +28,14 @@ msgstr "Απαιτήσεις Συστήματος"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "Η ενότητα αυτή περιέχει πληροφορίες σχετικά με το υλικό που χρειάζεστε για "
@@ -56,13 +60,13 @@ msgstr "Υποστηριζόμενο Υλικό"
 #| "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 architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "To Debian δεν βάζει κάποιες απαιτήσεις υλικού πέρα από αυτές που έχουν ο "
 "πυρήνας του Linux και τα εργαλεία του GNU. Κατά συνέπεια οποιαδήποτε "
@@ -94,9 +98,12 @@ msgstr "Υποστηριζόμενες Αρχιτεκτονικές"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
 msgstr ""
 "Το Debian GNU/Linux &release; υποστηρίζει ένδεκα κύριες αρχιτεκτονικές και "
@@ -111,8 +118,9 @@ msgstr "Αρχιτεκτονική"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Debian Designation "
 
 #. Tag: entry
@@ -460,7 +468,7 @@ msgstr "ταινία"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -486,9 +494,9 @@ msgstr ""
 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."
+"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 ""
 "To κείμενο αυτό καλύπτει την εγκατάσταση για την αρχιτεκτονική "
 "<emphasis>&arch-title;</emphasis>. Αν ψάχνετε για πληροφορίες σε οποιαδήποτε "
@@ -579,11 +587,16 @@ msgstr "Υποστηρίζονται τόσο επεξεργαστές AMD64 ό�
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 απαιτεί τον δικό της πυρήνα. Εξαιτίας αυτού "
@@ -594,10 +607,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "Οι περισσότεροι επεξεργαστές ARM μπορούν να τρέξουν και στις δυο καταστάσεις "
@@ -619,14 +636,22 @@ msgstr "IOP32x "
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "Η γραμμή προϊόντων I/O Processor (IOP) της Intel απαντάται σε έναν αριθμό "
 "προϊόντων που σχετίζονται με αποθήκευση και επεξεργασία δεδομένων. Το Debian "
@@ -726,10 +751,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 "Η πλατφόρμα Versatile μπορεί να προσομοιωθεί με τον προσομοιωτή QEMU "
 "δίνοντας έτσι έναν καλό τρόπο να δοκιμάσει και να τρέξει κανείς το Debian "
@@ -770,24 +798,43 @@ 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>."
+#, fuzzy, 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\", "
+"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>."
 msgstr ""
 "Όμως το Debian GNU/Linux &releasename; <emphasis>δεν</emphasis> θα τρέξει σε "
 "επεξεργαστές 386 ή προγενέστερους. Παρά το όνομα της αρχιτεκτονικής "
@@ -849,22 +896,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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, "
 "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> </"
+"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>."
+"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>."
 msgstr ""
 "To Debian στην αρχιτεκτονική &arch-title; υποστηρίζει τις ακόλουθες "
 "πλατφόρμες:<itemizedlist><listitem><para>SGI IP 22: αυτή η πλατφόρμα "
@@ -886,10 +948,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -913,17 +980,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"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>."
@@ -989,9 +1069,12 @@ msgstr "Γεύσεις του πυρήνα"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
 "Υπάρχουν δύο γεύσεις του πυρήνα για powerpc στο Debian, ανάλογα με τον τύπο "
@@ -1069,12 +1152,17 @@ msgstr "Η Υποαρχιτεκτονική Macintosh (pmac)"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "Η Apple (και για ένα σύντομο διάστημα μερικοί άλλοι κατασκευαστές &mdash; "
 "για παράδειγμα η Power Computing), κατασκεύασαν μια σειρά υπολογιστών "
@@ -1504,18 +1592,29 @@ 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>."
+#, fuzzy, 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 "
+"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>."
 msgstr ""
 "Συστήματα NuBus δεν υποστηρίζονται αυτή τη στιγμή από το Debian/powerpc.H "
 "αρχιτεκτονική του μονολιθικού πυρήνα Linux/PPC δεν έχει υποστήριξη για τα "
@@ -1654,11 +1753,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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. Υποστήριξη για τις "
@@ -1754,11 +1857,18 @@ msgstr "Πολλαπλοί Επεξεργαστές"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1783,11 +1893,11 @@ msgstr ""
 #| "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 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>"
+"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 ""
 "Για να βελτιστοποιήσετε τον πυρήνα για συστήματα με ένα επεξεργαστή, θα "
 "πρέπει να αντικαταστήσετε τον προκαθορισμένο πυρήνα του Debian. <phrase arch="
@@ -1800,11 +1910,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1819,23 +1936,33 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
+"not compiled with SMP support."
 msgstr ""
 "Η ποικιλία 486 των πακέτων του πυρήνα του Debian για την αρχιτεκτονική &arch-"
 "title; δεν έχουν δημιουργηθεί με υποστήριξη SMP."
 
 #. Tag: para
 #: hardware.xml:1172
-#, no-c-format
+#, fuzzy, 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."
+"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>συμμετρική "
 "πολυ-επεξεργασία</quote> ή SMP &mdash; είναι διαθέσιμη για την αρχιτεκτονική "
@@ -1857,7 +1984,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1873,14 +2000,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "Υποστήριξη για πολλούς επεξεργαστές &mdash; γνωστή και σαν <quote>συμμετρική "
 "πολυ-επεξεργασία</quote> ή SMP &mdash; είναι διαθέσιμη για την αρχιτεκτονική "
@@ -1953,13 +2088,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, 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;."
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
+"&debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
 "Η υποστήριξη που παρέχει το Debian για γραφικά περιβάλλοντα καθορίζεται από "
 "την υποκείμενη υποστήριξη που υπάρχει στο σύστημα Χ11 του X.Org. Οι "
@@ -2210,14 +2351,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, 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>"
+#, fuzzy, 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 "
+"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 ""
 "Σε κάποιες περιπτώσεις ο οδηγός που πιθανόν να χρειάζεστε μπορεί να μην "
 "είναι διαθέσιμος σαν πακέτο του Debian. Θα πρέπει τότε να ψάξετε αν υπάρχει "
@@ -2508,9 +2656,15 @@ msgstr "Αγοράζοντας υλικό ειδικά για το GNU/&arch-ker
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2699,14 +2853,21 @@ msgstr "Μέσα Εγκατάστασης"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "Η ενότητα αυτή θα σας βοηθήσει να προσδιορίσετε τα διαφορετικά μέσα που "
 "μπορείτε να χρησιμοποιήσετε για να εγκαταστήσετε το Debian. Για παράδειγμα, "
@@ -2871,10 +3032,17 @@ msgstr "USB stick μνήμης"
 
 #. Tag: para
 #: hardware.xml:1767
-#, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2969,14 +3137,22 @@ msgstr "Υποστηριζόμενα συστήματα Αποθήκευσης"
 
 #. Tag: para
 #: hardware.xml:1821
-#, 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="
+#, fuzzy, 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, "
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "Οι δίσκοι εκκίνησης του Debian περιέχουν έναν πυρήνα που είναι φτιαγμένος "
@@ -2990,11 +3166,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, 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 "
+#, fuzzy, 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 παρέχει υποστήριξη για δισκέττες, "
diff --git a/po/el/install-methods.po b/po/el/install-methods.po
index 53a4874cc..7d7a18372 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -38,14 +38,28 @@ msgstr "Επίσημες Συλλογές των CD-ROM του &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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -71,7 +85,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -80,7 +106,7 @@ msgid ""
 "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 "
+"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."
@@ -131,16 +157,20 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, 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
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "Για να βρείτε τον πλησιέστερο (και άρα πιθανόν τον γρηγορότερο) κατοπτριστή "
 "αρχείων δείτε το σύνδεσμο <ulink url=\"&url-debian-mirrors;\">λίστα των "
@@ -148,9 +178,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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 χρησιμοποιώντας "
@@ -165,9 +199,15 @@ msgstr "Πού να βρείτε Είδωλα της Εγκατάστασης"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -227,10 +267,14 @@ msgstr "Αρχεία εγκατάστασης GLAN Tank"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "Tο σύστημα GLAN Tank απαιτεί έναν πυρήνα και έναν δίσκο μνήμης σε κατάτμηση "
@@ -245,10 +289,14 @@ msgstr "Αρχεία εγκατάστασης Kurobox Pro"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "Tο σύστημα Kurobox Pro απαιτεί έναν πυρήνα και έναν δίσκο μνήμης σε "
@@ -410,12 +458,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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, όπως εξηγείται στην "
@@ -577,10 +632,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "Τα εργαλεία αυτά μπορούν να βρεθούν στα επίσημα CD-ROM του Debian και κάτω "
 "από τον κατάλογο <filename>/tools</filename>."
@@ -593,10 +651,19 @@ 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 "
+#, fuzzy, 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 "
 "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 "
@@ -638,12 +705,17 @@ msgstr "Εγγραφή Ειδώλων Δίσκων με το <command>Disk Copy<
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "Αν δημιουργείτε το είδωλο δισκέττας από αρχεία που βρίσκονταν αρχικά στο "
 "επίσημο CD του &debian-gnu; τότε οι παράμετροι Type και Creator είναι ήδη "
@@ -1037,14 +1109,23 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -1097,7 +1178,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:685
-#, no-c-format
+#, fuzzy, 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 "
@@ -1108,7 +1201,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "Καθώς τα περισσότερα κλειδιά USB έρχονται προδιαμορφωμένα με μια μοναδική "
 "κατάτμηση FAT16, το πιθανότερο είναι ότι δεν θα χρειαστεί να "
@@ -1229,10 +1322,18 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:768
-#, no-c-format
+#, fuzzy, 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 "
+"&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> "
@@ -1250,7 +1351,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1263,7 +1377,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "Τα περισσότερα κλειδιά USB δεν έρχονται προ-ρυθμισμένα με τέτοιο τρόπο που "
 "το Open Firmware να μπορεί να εκκινήσει από αυτά, οπότε θα πρέπει να "
@@ -1408,12 +1522,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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> θα πρέπει τώρα "
 "να αντιγράψετε μια εικόνα ISO του Debian (businesscard, netinst ή πλήρη "
@@ -1556,7 +1675,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1620,7 +1739,8 @@ 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:\\</filename>."
+"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"filename>."
 msgstr ""
 "Αντιγράψτε τα ακόλουθα αρχεία από τις αρχειοθήκες του Debian σε μια βολική "
 "τοποθεσία στο σκληρό σας δίσκο, για παράδειγμα στο <filename>/boot/"
@@ -1649,14 +1769,24 @@ msgstr "Εκκίνηση του Εγκαταστάτη από το σκληρό
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1674,12 +1804,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1729,10 +1871,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1864,10 +2011,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "Μερικά παλιότερα μηχανήματα HPPA (πχ. 715/75) χρησιμοποιούν RBOOTD αντί για "
 "BOOTP. Υπάρχει για το Debian διαθέσιμο ένα πακέτο <classname>rbootd</"
@@ -2152,13 +2302,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2296,10 +2477,16 @@ 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 "
+#, fuzzy, 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."
@@ -2314,10 +2501,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2531,8 +2731,8 @@ msgstr "Αυτόματη Εγκατάσταση"
 #| "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 "
+"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 ""
@@ -2545,15 +2745,21 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Automatic Installation Using the Debian Installer"
+msgid "Automatic Installation Using the &debian; Installer"
 msgstr "Αυτόματη εγκατάσταση με χρήση του Debian Installer "
 
 #. Tag: para
 #: install-methods.xml:1604
-#, no-c-format
+#, fuzzy, 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 "
+"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."
diff --git a/po/el/installation-howto.po b/po/el/installation-howto.po
index 0a95275f3..79134c068 100644
--- a/po/el/installation-howto.po
+++ b/po/el/installation-howto.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-howto\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-09-28 18:17+0300\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -98,12 +98,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "Μερικές μέθοδοι εγκατάστασης απαιτούν άλλου είδους εικόνες, και όχι εικόνες "
 "CD. <phrase condition=\"unofficial-build\"> Η <ulink url=\"&url-d-i;"
@@ -177,11 +182,15 @@ msgstr "Δισκέττα (floppy)"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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. Χρειάζεστε τα αρχεία "
@@ -254,10 +263,14 @@ msgstr "USB memory stick"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "Η εγκατάσταση από αφαιρούμενη συσκευή αποθήκευσης USB είναι επίσης εφικτή."
@@ -266,14 +279,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -374,12 +396,21 @@ msgstr "Εκκίνηση από σκληρό δίσκο"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -498,12 +529,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "Αν διαθέτετε ήδη ένα τμήμα (διαμέρισμα) DOS ή Windows και θέλετε να το "
@@ -682,10 +719,13 @@ msgstr "Και τέλος&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"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 "
 "χρήσιμο. Ίσως να θέλετε να διαβάσετε και το <xref linkend=\"post-install\" /"
diff --git a/po/el/partitioning.po b/po/el/partitioning.po
index f021c3057..357037714 100644
--- a/po/el/partitioning.po
+++ b/po/el/partitioning.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partitioning\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-02-23 17:37+0200\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -20,14 +20,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, 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"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "Αποφασίζοντας για τις κατατμήσεις στο Debian και τα μεγέθη τους"
 
 #. Tag: para
@@ -134,14 +136,21 @@ msgstr "Το Δέντρο των Καταλόγων"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "Το &debian-gnu; ακολουθεί πιστά το πρότυπο <ulink url=\"&url-fhs-home;"
 "\">Filesystem Hierarchy Standard</ulink> για την ονομασία των καταλόγων και "
@@ -425,15 +434,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -502,9 +524,16 @@ msgstr "Προτεινόμενο Σχήμα Διαμέρισης"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -537,17 +566,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Πιθανόν να χρειαστείτε και μια ξεχωριστή κατάτμηση για τον κατάλογο "
 "<filename>/usr/local</filename> αν σκοπεύετε να εγκαταστήσετε πολλά "
@@ -853,15 +892,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, 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 "
+#, fuzzy, 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."
@@ -878,9 +923,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -1099,14 +1149,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "Αν έχετε ήδη ένα άλλο λειτουργικό σύστημα όπως DOS ή Windows και θέλετε να "
@@ -1201,12 +1259,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/el/post-install.po b/po/el/post-install.po
index 43c2b64e5..a25c2a2ab 100644
--- a/po/el/post-install.po
+++ b/po/el/post-install.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: post-install\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2009-01-26 17:43+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -104,7 +104,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -112,7 +121,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "To Linux είναι μια υλοποίηση του Unix. Το project  <ulink url=\"&url-ldp;"
@@ -126,19 +135,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "Προσανατολιστείτε στο Debian"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "Το Debian διαφέρει λίγο από άλλες διανομές. Ακόμα κι αν είσαστε "
@@ -151,15 +168,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "Το σύστημα πακέτων του Debian"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -305,13 +338,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"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</"
@@ -324,19 +365,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "Ο <ulink url=\"http://www.debian.org/\">δικτυακός τόπος του Debian </ulink> "
 "περιέχει εκτενή τεκμηρίωση για το Debian. Δείτε ιδιαίτερα το <ulink url="
@@ -372,12 +427,17 @@ msgstr "Ρύθμιση του συστήματός σας για την χρήσ
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "Σήμερα, η ηλεκτρονική αλληλογραφία (email) είναι ένα σημαντικό κομμάτι της "
 "ζωής πολλών ανθρώπων. Καθώς υπάρχουν αρκτές επιλογές για το πώς μπορείτε να "
@@ -437,17 +497,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "Με την αυξανόμενη δημοτικότητα των γραφικών συστημάτων επιφάνειας εργασίας η "
@@ -541,10 +612,14 @@ msgstr "Αποστολή αλληλογραφίας εκτός συστήματ�
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 είναι ρυθμισμένο "
@@ -585,13 +660,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Μπορεί όμως στην περίπτωση αυτή να χρειαστεί να ρυθμίσετε ξεχωριστά "
 "βοηθητικά προγράμματα ώστε να αποστέλλουν σωστά τα ηλεκτρονικά μηνύματα.Ένα "
@@ -827,11 +908,18 @@ msgstr "Χτίσιμο ενός καινούριου πυρήνα"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -906,9 +994,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -938,10 +1032,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -997,7 +1098,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -1009,7 +1123,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "Τώρα μπορείτε να διαμορφώσετε τον πυρήνα σας. Εκτελέστε την εντολή "
@@ -1107,9 +1221,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/el/preface.po b/po/el/preface.po
index b6920b52f..9065113d9 100644
--- a/po/el/preface.po
+++ b/po/el/preface.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preface\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2006-08-14 11:46+0300\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: el <debian-l10n-greek@lists.debian.org>\n"
@@ -27,13 +27,19 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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; είναι "
@@ -44,10 +50,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/el/preparing.po b/po/el/preparing.po
index e95337f1b..ef070da6b 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -30,9 +30,13 @@ msgstr "Πριν την εγκατάσταση του &debian-gnu;"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -49,11 +53,15 @@ msgstr "Επισκόπηση της Διαδικασίας Εγκατάστασ�
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 είναι πολύ "
 "σπάνια η περίπτωση που θα χρειαστείτε να κάνετε μια πλήρη επανεγκατάσταση "
@@ -78,15 +86,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -135,16 +154,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, 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
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "Εντοπίστε και/ή κατεβάστε το λογισμικό του εγκαταστάτη μαζί με οποιουσδήποτε "
 "ειδικούς οδηγούς που πιθανόν απαιτεί το σύστημά σας (όχι για τους χρήστες "
@@ -152,9 +175,12 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "Ρυθμίστε ταινίες/δισκέττες/USB sticks εκκίνησης ή τοποθετήστε τα αρχεία "
@@ -200,8 +226,9 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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."
@@ -422,10 +449,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -436,10 +468,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "Το κείμενο που διαβάζεται τώρα, που είναι μια έκδοση σε ανάπτυξη τοθ Οδηγού "
@@ -521,10 +557,14 @@ msgstr "Linux για την αρχιτεκτονική &arch-title;"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "Το IBM Redbook που περιγράφει τις διαθέσιμες διανομές Linux για mainframes. "
@@ -1131,11 +1171,19 @@ msgstr "5 gigabytes"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1194,12 +1242,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1269,11 +1327,11 @@ 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 "
+"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."
+"very least you will need a dedicated partition for the &debian; root."
 msgstr ""
 "Αν έχετε ήδη ένα λειτουργικό σύστημα στο μηχάνημά σας <phrase arch=\"i386\"> "
 "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
@@ -1338,10 +1396,15 @@ msgstr "ΔΙΟΡΘΩΣΕ ΜΕ: γράψε για δίσκους σε HP-UX?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1383,11 +1446,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1402,10 +1472,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "Αν το μηχάνημά σας έχει ένα σύστημα αρχείων FAT που χρησιμοποιείται από το "
@@ -1415,11 +1489,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1439,12 +1522,19 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:849
-#, no-c-format
+#, fuzzy, 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."
+"&debian; installation. Windows and other OS installations may destroy your "
+"ability to start &debian;, or encourage you to reformat non-native "
+"partitions."
 msgstr ""
 "Αν σκοπεύετε να εγκαταστήσετε περισσότερα από ένα λειτουργικά συστήματα στο "
 "ίδιο μηχάνημα. θα πρέπει να εγκαταστήσετε όλα τα άλλα λειτουργικά πριν "
@@ -1482,8 +1572,8 @@ msgid ""
 "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."
+"can delete the placeholder with the &debian; partition tools later during "
+"the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 "Για να μπορεί το OpenFirmware να ξεκινά αυτόματα το &debian-gnu; οι "
 "κατατμήσεις του Linux θα πρέπει να εμφανίζονται πριν από οποιεσδήποτε άλλες "
@@ -1498,11 +1588,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "Αν έχετε αυτή τη στιγμή έναν σκληρό δίσκο με μια κατάτμηση (μια συνηθισμένη "
 "περίπτωση για υπολογιστές γραφείου) και θέλετε να έχετε πολλαπλή εκκίνηση με "
@@ -1549,18 +1643,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "Επανεκκινήστε στο παλιό σας λειτουργικό για να ελέγξετε ότι όλα είναι "
 "ενταξει και για να κατεβάσετε τα αρχεία εκκίνησης του Debian installer."
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, 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."
@@ -1573,12 +1671,17 @@ msgstr "Κατάτμηση από DOS ή Windows"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "Αν τροποποιείτε υπάρχουσες κατατμήσεις FAT ή NTFS, συνιστούμε να "
 "χρησιμοποιήσετε είτε το παρακάτω σχήμα είτε εργαλεία των ίδιων των Windows ή "
@@ -1588,13 +1691,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1616,11 +1727,22 @@ msgstr "Επανακατάτμηση χωρίς απώλειες όταν ξεκ
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1642,14 +1764,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 ""
 "Πριν προχωρήσετε θα πρέπει να αποφασίσετε για το πώς θα χωρίσετε τον δίσκο "
 "σας. Η μέθοδος που περιγράφεται στην ενότητα αυτή αφορά το χώρισμα του "
@@ -1680,17 +1809,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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</"
@@ -1759,11 +1899,17 @@ msgstr "Κατάτμηση για DOS"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1776,12 +1922,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "Κατά τα φαινόμενα, όποτε δημιουργείτε ή αλλάζετε το μέγεθος μιας κατάτμησης "
 "για χρήση με DOS, είναι καλή ιδέα να γεμίσετε τους πρώτους λίγους τομείς με "
@@ -1802,11 +1953,18 @@ msgstr "Κατάτμηση από SunOS"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1961,10 +2119,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1988,13 +2154,21 @@ msgstr "Κλήση του BIOS Set-Up Menu"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "Το BIOS παρέχει τις βασικές λειτουργίες που χρειάζονται για την εκκίνηση του "
 "μηχανήματός σας ώστε με τη σειρά του να επιτρέψει στο λειτουργικό σύστημα να "
@@ -2131,7 +2305,16 @@ msgstr "Επιλογή συσκευής εκκίνησης"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -2139,7 +2322,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "Πολλά μενού ρύθμισης του BIOS σας επιτρέπουν να επιλέξετε τις συσκευές που "
 "θα χρησιμοποιηθούν για την αρχική εκκίνηση του συστήματος. Θέστε σαν τέτοιο "
@@ -2809,17 +2992,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "Πριν κάνετε την πραγματική εγκατάσταση, πρέπει να κάνετε μια σειρά από "
 "βήματα σχεδιασμού και προετοιμασίας. Η IBM έχει κάνει διαθέσιμη την "
diff --git a/po/el/preseed.po b/po/el/preseed.po
index 18fa42fdc..f4b414144 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -628,12 +628,26 @@ 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"
+#, fuzzy, 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 "
+"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 "
@@ -1054,14 +1068,22 @@ msgstr "Χρήση ενός εξυπηρετητή DHCP για τον προσδ
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "Είναι επίσης δυνατόν να χρησιμοποιήσετε το πρωτόκολλο DHCP για τον "
@@ -1104,13 +1126,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"automate &debian; installs should only be done with care."
 msgstr ""
 "Ένας καλός τρόπος να χρησιμοποιήσετε την μέθοδο προρύθμισης με χρήση DHCP "
 "είναι να προρυθμίσετε μόνο τις τιμές που έχουν να κάνουν με το δίκτυό σας, "
diff --git a/po/el/random-bits.po b/po/el/random-bits.po
index b203bc31c..f208b7e50 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -866,7 +866,16 @@ msgstr "Εγκαθιστώντας το &debian-gnu; από ένα Σύστημ�
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -875,7 +884,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "Η ενότητα αυτή εξηγεί πώς να εγκαταστήσετε το &debian-gnu; από ένα υπάρχον "
 "from Unix ή Linux σύστημα, χωρίς τη χρήση του βασισμένου στις ncurses, και "
@@ -890,13 +899,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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 σύστημά σας σύμφωνα με "
 "τις προτιμήσεις σας, μπορείτε να μεταφέρετε τα υπάρχοντα δεδομένα σας (αν "
@@ -908,11 +923,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:383
-#, no-c-format
+#, fuzzy, 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 "
-"also require more knowledge of Debian and of &arch-kernel; in general than "
+"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 "
@@ -973,10 +997,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -1027,17 +1061,28 @@ msgstr "Εγκαθιστώντας με το <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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 ""
 "Το εργαλείο που χρησιμοποιεί ο εγκαταστάτης του Debian, και που "
 "αναγνωρίζεται σαν ο επίσημος τρόπος για να εγκαταστήσετε ένα βασικό σύστημα "
@@ -1053,14 +1098,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1099,10 +1155,16 @@ msgstr "Τρέξτε το <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1166,13 +1228,20 @@ msgstr "Ρύθμιση του βασικού συστήματος"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 "Τώρα που έχετε ένα πραγματικό σύστημα Debian στον δίσκο σας, αν και μάλλον "
 "πολύ βασικό, μπορείτε να κάνετε <command>chroot</command> σ' αυτό: "
@@ -1269,7 +1338,48 @@ msgstr "Προσαρτήστε τα τμήματα"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1296,7 +1406,7 @@ msgid ""
 "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 "
+"</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"
@@ -1664,12 +1774,17 @@ msgstr "Ρύθμιση του Φορτωτή Εκκίνησης (Boot Loader)"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "Για να καταστήσετε το σύστημά σας &debian-gnu; εκκινήσιμο, ρυθμίστε τον "
 "φορτωτή εκκίνησης ώστε να φορτώνει τον εγκατεστημένο πυρήνα με την καινούρια "
@@ -1693,8 +1808,8 @@ msgstr ""
 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 "
+"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 "
@@ -1779,11 +1894,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1880,12 +2003,19 @@ msgstr "Εγκαθιστώντας το &debian-gnu; πάνω από Parallel Li
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 "Η ενότητα αυτή εξηγεί πώς να εγκαταστήσετε το &debian-gnu; σε έναν "
 "υπολογιστή χωρίς κάρτα Ethernet, αλλά μόνο μ' έναν απομακρυσμένο υπολογιστή "
@@ -1945,10 +2075,13 @@ msgstr "Απαιτήσεις"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr ""
 "Ένα σύστημα προορισμού, που ονομάζεται <emphasis>target</emphasis>, στον "
 "οποίον θα εγκατασταθεί το Debian."
@@ -2399,11 +2532,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2418,11 +2558,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/el/using-d-i.po b/po/el/using-d-i.po
index 1019e9383..eb625afff 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -26,8 +26,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "Χρησιμοποιώντας τον Εγκαταστάτη του Debian "
 
 #. Tag: title
@@ -38,9 +39,15 @@ msgstr "Πώς λειτουργεί ο Εγκαταστάτης"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -383,8 +390,9 @@ msgstr "cdrom-detect "
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Ψάχνει και προσαρτά ένα CD εγκατάστασης του Debian."
 
 #. Tag: term
@@ -425,10 +433,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr ""
 "Παρουσιάζει μία λίστα με καθρέφτες της αρχειοθήκης του Debian. Ο χρήστης "
 "μπορεί να επιλέξει την πηγή των προς εγκατάσταση πακέτων του."
@@ -518,12 +529,17 @@ msgstr "προγραμμα διαμέρισης"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "Επιτρέπει στο χρήστη να διαμερίσει τους δίσκους που είναι συνδεδεμένοι στο "
 "σύστημα, να δημιουργήσει συστήματα αρχείων σε κατατμήσεις που έχει επιλέξει, "
@@ -732,11 +748,16 @@ msgstr "save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "Παρέχει στομ χρήστη έναν τρόπο καταγραφής πληροφοριών σε μια δισκέττα, μέσω "
 "δικτύου, σε έναν σκληρό δίσκο, ή σε άλλο μέσο, στην περίπτωση αντιμετώπισης "
@@ -771,15 +792,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -993,11 +1025,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -1207,18 +1245,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, 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
+#, fuzzy, 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."
+"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> , θα έρθει "
 "μια στιγμή που θα πρέπει να βρείτε και να προσαρτήσετε το εικόνα τύπου iso "
@@ -1228,7 +1272,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1239,9 +1297,9 @@ msgid ""
 "<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."
+"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> προσαρτά αυτόματα όλες τις "
 "συσκευές μπλοκ (π.χ. κατατμήσεις) που περιέχουν κάποιο γνωστό σύστημα "
@@ -2164,13 +2222,19 @@ msgstr "Διαμέριση με το χέρι"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "Εάν επιλέξετε χειροκίνητη διαμέριση, θα εμφανιστεί  μια παρόμοια οθόνη με "
 "την προηγούμενη, εκτός από το ότι θα εμφανιστεί ο υπάρχων πίνακας διαμέρισης "
@@ -4468,13 +4532,19 @@ msgstr "Ανίχνευση άλλων λειτουργικών συστημάτ�
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "Πριν να εγκατασταθεί ένας φορτωτής εκκίνησης, ο εγκαταστάτης θα προσπαθήσει "
 "να ελέγξει εάν υπάρχουν εγκατεστημένα κι άλλα λειτουργικά συστήματα στον "
@@ -4643,17 +4713,22 @@ msgstr ""
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "νέο τμήμα Debian"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"will install itself at the beginning of the new &debian; partition and it "
+"will serve as a secondary boot loader."
 msgstr ""
 "Επιλέξτε το εάν θέλετε να χρησιμοποιήσετε κάποιον άλλο διαχειριστή "
 "εκκίνησης. Ο <command>LILO</command> θα εγκατασταθεί στην αρχή του νέου "
@@ -4681,13 +4756,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "Εάν μετά απ' αυτό το βήμα δεν μπορείτε πια να εκκινήσετε τα Windows 9x (ή "
 "DOS), θα πρέπει να χρησιμοποιήσετε μια δισκέτα εκκίνησης των Windows 9x (MS-"
@@ -4841,10 +4922,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4861,11 +4947,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
 msgstr ""
 "Αυτό είναι το αρχικό βασικό σύστημα αρχείων που χρησιμοποιείται για την "
@@ -4901,12 +4993,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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>. Σε μια τυπική "
@@ -5191,9 +5288,13 @@ msgstr "Τελειώνοντας την Εγκατάσταση"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -5260,11 +5361,15 @@ msgstr "Επανεκκίνηση του Συστήματος"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Θα δείτε την προτροπή να απομακρύνετε το μέσο εκκίνησης (CD, δισκέτα κ.λπ.) "
 "που χρησιμοποιήσατε για να ξεκινήσετε τον εγκαταστάτη. Μετά από αυτό το "
@@ -5310,11 +5415,15 @@ msgstr "Αποθήκευση αρχείων ημερολογίου εγκατά�
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "Εάν η εγκατάσταση είναι επιτυχής, τα αρχεία καταγραφής που δημιουργήθηκαν  "
 "στην διάρκεια της εγκατάστασης θα αποθηκευτούν αυτόματα στο κατάλογο  "
diff --git a/po/el/welcome.po b/po/el/welcome.po
index 1097a7c89..c2bc372ea 100644
--- a/po/el/welcome.po
+++ b/po/el/welcome.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2009-11-26 15:23+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -22,17 +22,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "Καλώς ήλθατε στο Debian"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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 και της "
@@ -397,17 +402,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, 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
+#, fuzzy, 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 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 "
+"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 "
@@ -430,9 +447,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -445,12 +467,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Το Debian είναι εξαιρετικά δημοφιλές μεταξύ των προχωρημένων χρηστών λόγω "
 "της τεχνικής αρτιότητάς του και της βαθιάς προσήλωσής του στις ανάγκες και "
@@ -459,9 +486,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -473,9 +505,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -488,11 +525,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -509,15 +555,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "Για να προστατευθεί το σύστημά σας απέναντι σε <quote>δούρειους ίππους</"
 "quote> και άλλο επικίνδυνο λογισμικό, οι Debian servers επαληθεύουν ότι τα "
@@ -530,15 +584,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Ο κύριος, και καλίτερος, τρόπος για να έχετε υποστήριξη για το Debian GNU/"
 "Linuxσύστημά σας και να επικοινωνήσετε με τους Προγραμματιστές του Debian "
@@ -553,28 +615,43 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Τι είναι το Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Το Debian GNU/Hurd είναι ένα σύστημα Debian GNU που αντικαθιστά τον "
+"μονολιθικό πυρήνα του Linux με το GNU Hurd &mdash; ένα σύνολο servers που "
+"τρέχουν πάνω από τον μικροπυρήνα GNU Mach.  Το Hurd δεν έχει ακόμα "
+"ολοκληρωθεί, και είναι ακατάλληλο για καθημερινή χρήση, αλλά η ανάπτυξή του "
+"συνεχίζεται. Το Hurd αναπτύσσεται προς το παρόν μόνο για  την αρχιτεκτονική "
+"i386, αν και μεταφορά του σε άλλες αρχιτεκτονικές θα γίνει από τη στιγμή που "
+"το σύστημα γίνει πιο σταθερό."
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -587,7 +664,7 @@ msgstr ""
 #| "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 "
+"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/"
@@ -596,16 +673,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "Τι είναι το Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -636,16 +714,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 "Για περισσότερες πληροφορίες, δείτε τη <ulink url=\"http://www.debian.org/"
@@ -654,19 +736,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "Αποκτώντας το Debian"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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; από το "
 "Διαδίκτυο ή από που μπορείτε να αγοράσετε επίσημα CD του Debian, κοιτάξτε τη "
@@ -676,9 +765,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -718,12 +811,17 @@ msgstr "Οργάνωση αυτού του κειμένου"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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. Κάνει έτσι όσο το δυνατόν "
@@ -733,12 +831,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "Οι έμπειροι χρήστες μπορούν επίσης να βρουν στο κείμενο αυτό ενδιαφέρουσες "
 "αναφορές, όπως ελάχιστα μεγέθη για μια εγκατάσταση, λεπτομέρειες για το "
@@ -771,12 +874,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Κάντε Backup στο σύστημά σας, κάντε κάθε απαραίτητο σχεδιασμό και ρύθμιση "
 "του hardware πριν την εγκατάσταση του Debian, στο <xref linkend=\"preparing"
@@ -807,15 +915,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "Κάντε την πραγματική εγκατάσταση σύμφωνα με το κεφάλαιο <xref linkend=\"d-i-"
@@ -840,11 +957,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "Όταν έχετε εγκαταστήσει το σύστημά σας, μπορείτε να διαβάσετε το <xref "
 "linkend=\"post-install\"/>. Αυτό το κεφάλαιο εξηγεί που να κοιτάξετε για να "
@@ -907,7 +1028,18 @@ msgstr "Σχετικά με τα Πνευματικά Δικαιώματα κα�
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -917,7 +1049,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Είμαστε βέβαιοι ότι έχετε διαβάσει μερικές από τις άδειες που έρχονται με τα "
 "περισσότερα προγράμματα εμπορικού λογισμικού &mdash; λένε συνήθως ότι "
@@ -956,16 +1088,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "Σημειώστε ότι το Debian project σαν μια πραγματική προσφορά στους χρήστες "
 "τους έχει διαθέσιμα μερικά πακέτα που δεν πληρούν τα κριτήριά μας για να "
@@ -978,7 +1119,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -987,10 +1140,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "Πολλά από τα προγράμματα στο σύστημα διανέμονται με την άδεια χρήσης "
 "<emphasis>GNU</emphasis> <emphasis>General Public License</emphasis>, που "
@@ -1007,13 +1160,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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. Μπορείτε "
@@ -1024,9 +1183,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/es/administrivia.po b/po/es/administrivia.po
index 096be05f8..750857b70 100644
--- a/po/es/administrivia.po
+++ b/po/es/administrivia.po
@@ -9,7 +9,7 @@
 #
 #   - Updates
 #       Rudy, 2005
-#	Omar Campagne, 2010
+# 	Omar Campagne, 2010
 #
 # Traductores, si no conocen el formato PO, merece la pena leer la
 # documentación de gettext, especialmente las secciones dedicadas a este
@@ -29,11 +29,10 @@
 #     /usr/share/doc/po-debconf/README-trans
 #     o http://www.debian.org/intl/l10n/po-debconf/README-trans
 #
-
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-06 02:25+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -57,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 ""
@@ -116,8 +120,8 @@ msgstr ""
 "trabajo de Javier Fernández-Sanguino Peña, Rubén Porras, Rudy Godoy, David "
 "Moreno Garza, Bruno Barrera, Igor Támara, Omar Campagne Polaino, así como "
 "las contribuciones en traducción y revisión de los miembros del equipo de "
-"traducción a español de Debian (<email>debian-l10n-spanish@lists."
-"debian.org</email>)."
+"traducción a español de Debian (<email>debian-l10n-spanish@lists.debian.org</"
+"email>)."
 
 #. Tag: title
 #: administrivia.xml:50
@@ -232,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 "
@@ -245,8 +257,8 @@ msgstr ""
 "Muchos, muchos usuarios y desarrolladores de Debian han contribuido a este "
 "documento. Queremos agradecer de forma particular las numerosas revisiones y "
 "textos proporcionados por Michael Schmitz (compatibilidad con m68k), Frank "
-"Neumann (autor original del <ulink url=\"&url-m68k-old-amiga-install;\">"
-"Manual de instalación en Amiga</ulink>), Arto Astala, Eric Delaunay y Ben "
+"Neumann (autor original del <ulink url=\"&url-m68k-old-amiga-install;"
+"\">Manual de instalación en Amiga</ulink>), Arto Astala, Eric Delaunay y Ben "
 "Collins (información sobre SPARC), Tapio Lehtonen, y Stéphane Bortzmeyer. De "
 "igual manera queremos agradecer a Pascal Le Bail la valiosa información de "
 "cómo arrancar un sistema utilizando memorias USB."
diff --git a/po/es/bookinfo.po b/po/es/bookinfo.po
index cc0a5e32a..1d4dec7a9 100644
--- a/po/es/bookinfo.po
+++ b/po/es/bookinfo.po
@@ -7,7 +7,7 @@
 #       Javier Fernández-Sanguino, 2004
 #
 #   - Updates
-#	Rudy Godoy, 2005
+# 	Rudy Godoy, 2005
 #       Omar Campagne, 2010
 #
 # Traductores, si no conocen el formato PO, merece la pena leer la
@@ -28,11 +28,10 @@
 #     /usr/share/doc/po-debconf/README-trans
 #     o http://www.debian.org/intl/l10n/po-debconf/README-trans
 #
-
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-09-29 22:23+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-30 01:14+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -50,13 +49,19 @@ msgstr "Guía de instalación de &debian-gnu;"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Este documento contiene las instrucciones de instalación del sistema &debian-"
 "gnu; &release; (nombre en clave <quote>&releasename;</quote>), para la "
@@ -66,17 +71,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 ""
 "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</"
diff --git a/po/es/boot-installer.po b/po/es/boot-installer.po
index 370dd09f6..b3c3d17af 100644
--- a/po/es/boot-installer.po
+++ b/po/es/boot-installer.po
@@ -6,10 +6,10 @@
 # Changes:
 #   - Initial translation
 #       Igor Támara, 2009
-#	Francisco Javier Cuadrado, 2009
-#	Javier Fernández-Sanguino 2004, 2005, 2006
-#	Rudy Godoy, 2004, 2005
-#	Rubén Porras Campo, 2004
+# 	Francisco Javier Cuadrado, 2009
+# 	Javier Fernández-Sanguino 2004, 2005, 2006
+# 	Rudy Godoy, 2004, 2005
+# 	Rubén Porras Campo, 2004
 #
 #   - Updates
 #       Omar Campagne, 2010
@@ -32,11 +32,10 @@
 #     /usr/share/doc/po-debconf/README-trans
 #     o http://www.debian.org/intl/l10n/po-debconf/README-trans
 #
-
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-09-29 22:23+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 23:10+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -135,10 +134,16 @@ msgstr "Arrancar desde CD-ROM"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -170,9 +175,15 @@ msgstr ""
 #. Tag: para
 #: 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 "
+#, fuzzy, 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 "
@@ -271,10 +282,34 @@ msgstr "A través de una red con Linux/Unix"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -374,12 +409,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, no-c-format
+#, fuzzy, 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 "
 "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> "
+"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:"
@@ -1010,10 +1053,24 @@ msgstr "La pantalla de arranque"
 
 #. Tag: para
 #: boot-installer.xml:715
-#, no-c-format
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1191,16 +1248,27 @@ msgstr "Contenidos del CD"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
 msgstr ""
 "Existen tres variaciones básicas de los CDs de instalación de Debian. El CD "
@@ -1235,17 +1303,24 @@ msgstr ""
 "y el registro principal de arranque (MBR), EFI puede leer y escribir "
 "ficheros de particiones de disco formateadas con FAT16 o FAT32. Esto "
 "simplifica el proceso, a menudo arcaico, de iniciar un sistema. El gestor de "
-"arranque del sistema y el firmware EFI que da compatibilidad tiene un sistema "
-"de ficheros completo para almacenar los ficheros necesarios para arrancar la "
-"máquina. Esto significa que el disco de sistema en un sistema IA-64 tiene "
-"una partición adicional dedicada a EFI en lugar del simple MBR o bloque de "
-"arranque en sistemas más convencionales."
+"arranque del sistema y el firmware EFI que da compatibilidad tiene un "
+"sistema de ficheros completo para almacenar los ficheros necesarios para "
+"arrancar la máquina. Esto significa que el disco de sistema en un sistema "
+"IA-64 tiene una partición adicional dedicada a EFI en lugar del simple MBR o "
+"bloque de arranque en sistemas más convencionales."
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1417,10 +1492,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 "
+#, fuzzy, 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 ""
 "Estos pasos inician el gestor de arranque de Debian el cual mostrará una "
@@ -1435,11 +1514,16 @@ msgstr "Opción 2: Arrancar desde el intérprete de órdenes de EFI"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "Si, por alguna razón, no tiene éxito usando la opción 1, reinicie la máquina "
@@ -1523,9 +1607,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
-msgid ""
-"As with option 1, these steps start the Debian boot loader which will "
+#, fuzzy, 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 "
@@ -1703,11 +1793,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "Pulse <command>ENTER</command>. Esto cargará e iniciará el núcleo. El núcleo "
 "mostrará sus mensajes de inicialización usuales, seguido por la primera "
@@ -1884,13 +1978,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "El gestor de arranque mostrará su cursor después que ha descargado y "
 "procesado su fichero de configuración. En este punto, la instalación se "
@@ -1906,13 +2006,22 @@ msgstr "Arranque TFTP en sistemas SGI"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -2091,17 +2200,24 @@ msgid ""
 "and <keycap>Delete</keycap> keys together while booting to boot from the CD-"
 "ROM."
 msgstr ""
-"Actualmente las únicas subarquitecturas &arch-title; que permiten el arranque "
-"desde CD-ROM son PReP (aunque no todos los sistemas) y PowerMacs NewWorld. "
-"En las PowerMac, mantenga presionada la tecla <keycap>c</keycap>, o en su "
-"lugar la combinación de teclas <keycap>Option</keycap>, <keycap>Shift</"
-"keycap> y <keycap>Delete</keycap> juntas para arrancar desde CD-ROM."
+"Actualmente las únicas subarquitecturas &arch-title; que permiten el "
+"arranque desde CD-ROM son PReP (aunque no todos los sistemas) y PowerMacs "
+"NewWorld. En las PowerMac, mantenga presionada la tecla <keycap>c</keycap>, "
+"o en su lugar la combinación de teclas <keycap>Option</keycap>, "
+"<keycap>Shift</keycap> y <keycap>Delete</keycap> juntas para arrancar desde "
+"CD-ROM."
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
-msgid ""
-"OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
+#, fuzzy, 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 "
@@ -2203,7 +2319,28 @@ msgstr "Arrancar Macs NewWorld desde OpenFirmware"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -2222,7 +2359,7 @@ msgid ""
 "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."
+"userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
 "Deberá previamente haber ubicado los ficheros <filename>initrd.gz</"
 "filename>, <filename>yaboot</filename> y <filename>yaboot.conf</filename> en "
@@ -2400,10 +2537,10 @@ msgid ""
 "equipped with floppy drives, and attached USB floppy drives are not "
 "supported for booting."
 msgstr ""
-"&arch-title; permite el arranque desde disquetes, aunque "
-"generalmente solo es aplicable para sistemas OldWorld. Los sistemas NewWorld "
-"no están equipados con unidades de disquete, y no hay compatibilidad con "
-"el arranque desde unidades de disquete conectadas a través de USB."
+"&arch-title; permite el arranque desde disquetes, aunque generalmente solo "
+"es aplicable para sistemas OldWorld. Los sistemas NewWorld no están "
+"equipados con unidades de disquete, y no hay compatibilidad con el arranque "
+"desde unidades de disquete conectadas a través de USB."
 
 #. Tag: para
 #: boot-installer.xml:1745
@@ -2851,8 +2988,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Parámetros del instalador de Debian"
 
 #. Tag: para
@@ -3055,9 +3193,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -3154,14 +3296,15 @@ msgid ""
 "installer, you can try booting with parameter <userinput>debian-installer/"
 "framebuffer=true</userinput> or <userinput>fb=true</userinput> for short."
 msgstr ""
-"La compatibilidad con framebuffer está <emphasis>deshabilitada por omisión"
-"</emphasis> para &arch-title; debido a los problemas de pantalla que se "
+"La compatibilidad con framebuffer está <emphasis>deshabilitada por omisión</"
+"emphasis> para &arch-title; debido a los problemas de pantalla que se "
 "producen en algunos sistemas. Esto puede dar lugar a una presentación visual "
 "poco agradable en aquellos sistemas que no ofrezcan una compatibilidad "
 "adecuada para el uso de framebufer, como es el caso de aquellos sistemas con "
 "tarjetas gráficas ATI. Si tiene problemas visuales con el instalador puede "
-"intentar arrancar con el parámetro <userinput>debian-installer/framebuffer="
-"true</userinput> o la versión reducida <userinput>fb=true</userinput>."
+"intentar arrancar con el parámetro <userinput>debian-installer/"
+"framebuffer=true</userinput> o la versión reducida <userinput>fb=true</"
+"userinput>."
 
 #. Tag: term
 #: boot-installer.xml:2270
@@ -3247,12 +3390,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 "Establezca a <userinput>verdadero</userinput> para habilitar el uso de "
 "discos RAID Serial ATA(también llamado ATA RAID, BIOS RAID o RAID falso) en "
@@ -3310,10 +3459,10 @@ msgid ""
 "boot parameters, but for those a special syntax can be used. See <xref "
 "linkend=\"preseed-seenflag\"/> for details."
 msgstr ""
-"Si se define como a <userinput>true</userinput> (verdadero), se mostrarán las "
-"preguntas aunque ya hayan sido preconfiguradas. Esta opción puede ser útil "
-"para probar o depurar un fichero de preconfiguración. Tenga en cuenta que "
-"este valor no tiene ningún efecto sobre los parámetros que se introducen "
+"Si se define como a <userinput>true</userinput> (verdadero), se mostrarán "
+"las preguntas aunque ya hayan sido preconfiguradas. Esta opción puede ser "
+"útil para probar o depurar un fichero de preconfiguración. Tenga en cuenta "
+"que este valor no tiene ningún efecto sobre los parámetros que se introducen "
 "como parámetros de arranque, pero puede utilizar una sintaxis especial para "
 "éstos. Para más información consulte <xref linkend=\"preseed-seenflag\"/>."
 
@@ -3611,14 +3760,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "El instalador utilizará el protocolo HTTP para descargar ficheros de las "
 "réplicas de Debian y no es posible cambiar a FTP en instalaciones que se "
@@ -3894,8 +4050,8 @@ msgid ""
 msgstr ""
 "Si su sistema arranca correctamente desde CD-ROM, no significa "
 "necesariamente que &arch-kernel; también tenga compatibilidad con CD-ROM (o, "
-"más concretamente, la controladora a la que está conectada su unidad de "
-"CD-ROM)."
+"más concretamente, la controladora a la que está conectada su unidad de CD-"
+"ROM)."
 
 #. Tag: para
 #: boot-installer.xml:2695
@@ -4126,10 +4282,13 @@ msgstr "Fiabilidad de los disquetes"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "El problema más habitual para las personas que utilizan disquetes para "
 "instalar Debian por primera vez suele ser la fiabilidad de los disquetes."
@@ -4343,9 +4502,9 @@ msgstr ""
 "<userinput>vga=788</userinput> activará el framebuffer con una resolución de "
 "800x600. Aunque ésta no sea la resolución óptima para su sistema "
 "probablemente funcione. Puede obtener una lista de las resoluciones "
-"aceptadas utilizando el parámetro <userinput>vga=ask</userinput>, pero ha "
-"de tener en cuenta que la lista puede no ser completa. </para> </footnote> "
-"para resolver este problema. Si eso no funciona puede intentar utilizar el "
+"aceptadas utilizando el parámetro <userinput>vga=ask</userinput>, pero ha de "
+"tener en cuenta que la lista puede no ser completa. </para> </footnote> para "
+"resolver este problema. Si eso no funciona puede intentar utilizar el "
 "parámetro de arranque <userinput>fb=false</userinput>."
 
 #. Tag: para
@@ -4645,14 +4804,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "La forma más sencilla de enviar un informe de instalación si tiene un "
 "sistema Debian funcionando es instalar los paquetes <quote>installation-"
diff --git a/po/es/boot-new.po b/po/es/boot-new.po
index 57cc6dff6..a3ad0d8e3 100644
--- a/po/es/boot-new.po
+++ b/po/es/boot-new.po
@@ -6,7 +6,7 @@
 # Changes:
 #   - Initial translation
 #       Javier Fernández-Sanguino, 2004, 2007
-#	Ruby Godoy
+# 	Ruby Godoy
 #
 #   - Updates
 #       Igor Támara, 2007
@@ -33,7 +33,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-09-29 22:23+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-30 01:14+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -45,8 +45,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "Arrancar desde su nuevo sistema Debian"
 
 #. Tag: title
@@ -67,13 +68,21 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:13
-#, no-c-format
+#, fuzzy, 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><phrase "
+#| "arch=\"x86\"> or possibly the <classname>lilo</classname> bootloader</"
+#| "phrase>. 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -86,11 +95,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -104,13 +120,25 @@ 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 "
+#, fuzzy, 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 "
+"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 "
@@ -609,11 +637,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/es/hardware.po b/po/es/hardware.po
index 0be9a9cca..0431442cc 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-05 16:48+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 22: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,14 @@ msgstr "Requisitos del sistema"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "Esta sección contiene información sobre el hardware necesario para empezar "
@@ -74,15 +78,23 @@ msgstr "Hardware compatible"
 
 #. Tag: para
 #: hardware.xml:21
-#, no-c-format
-msgid ""
-"Debian does not impose hardware requirements beyond the requirements of the "
-"Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debian does not impose hardware requirements beyond the requirements of "
+#| "the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+#| "architecture or platform to which the Linux or kFreeBSD 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 "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "Debian no impone requisitos de hardware más allá de los que establecen el "
 "núcleo Linux o kFreeBSD y el conjunto de herramientas GNU. En cualquier "
@@ -113,9 +125,12 @@ msgstr "Arquitecturas compatibles"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
@@ -130,8 +145,9 @@ msgstr "Arquitectura"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Designación de Debian"
 
 #. Tag: entry
@@ -478,8 +494,9 @@ msgstr "cinta"
 
 #. Tag: para
 #: hardware.xml:169
-#, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+#, fuzzy, no-c-format
+#| msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr "Debian GNU/kFreeBSD &release; es compatible con dos arquitecturas:"
 
 #. Tag: entry
@@ -496,13 +513,19 @@ msgstr "kfreebsd-amd64"
 
 #. Tag: para
 #: hardware.xml:196
-#, no-c-format
+#, fuzzy, no-c-format
+#| 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."
 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."
+"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 ""
 "Este documento cubre la instalación para la arquitectura <emphasis>&arch-"
 "title;</emphasis> usando el núcleo <emphasis>&arch-kernel;</emphasis>. Si "
@@ -586,11 +609,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Cada arquitectura de ARM diferente requiere su propio núcleo. Esto es debido "
@@ -601,10 +629,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "Muchas CPUs ARM también pueden funcionar en cualquier modo endian «little-"
@@ -626,14 +658,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "La línea de procesadores de Intel de Entrada/Salida («Intel's I/O Processor» "
 "o IOP) se puede encontrar en un conjunto de productos dedicados al "
@@ -734,10 +774,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 "La plataforma Versatile se emula con QEMU y por lo tanto es una forma bonita "
 "para probar y correr Debian en ARM si no tiene el hardware."
@@ -778,24 +821,43 @@ 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>."
+#, fuzzy, 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\", "
+"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>."
 msgstr ""
 "Sin embargo, Debian GNU/Linux &releasename; <emphasis>no</emphasis> "
 "funcionará en procesadores 386 o anteriores. Aunque la arquitectura se llame "
@@ -854,22 +916,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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, "
 "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> </"
+"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>."
+"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>."
 msgstr ""
 "Debian para &arch-title; es compatible con las siguientes subarquitecturas: "
 "<itemizedlist> <listitem><para> SGI IP22: esta plataforma incluye a las "
@@ -888,10 +965,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -914,17 +996,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"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>."
@@ -988,9 +1083,12 @@ msgstr "Tipos de núcleo"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1068,12 +1166,17 @@ msgstr "Subarquitectura Power Macintosh (pmac)"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "Apple (y algunos otros fabricantes como por ejemplo Power Computing) produjo "
 "diversas series de ordenadores Macintosh basados en el procesador PowerPC. A "
@@ -1501,18 +1604,29 @@ msgstr "Subarquitectura Nubus PowerMac (no es compatible)"
 
 #. 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>."
+#, fuzzy, 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 "
+"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>."
 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 "
@@ -1650,11 +1764,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "La última versión de Debian que compatible con la arquitectura sparc32 fue "
 "Etch, y sólo en sistemas sun4m. El uso de otras subarquitecturas de 32-bits "
@@ -1746,11 +1864,18 @@ msgstr "Múltiples procesadores"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1764,14 +1889,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1138
-#, no-c-format
+#, fuzzy, 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 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>"
+"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 ""
 "Para optimizar el núcleo para sistemas de un sólo procesador, tendrá que "
 "reemplazar el núcleo estándar de Debian. <phrase arch=\"linux-any\">Puede "
@@ -1783,11 +1915,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1801,23 +1940,33 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"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."
 
 #. Tag: para
 #: hardware.xml:1172
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Se permite el uso de múltiples procesadores (también llamado <quote>multi-"
 "procesamiento simétrico</quote> o SMP) con esta arquitectura. Sin embargo, "
@@ -1828,10 +1977,17 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1181
-#, no-c-format
+#, fuzzy, 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 "
+"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;</"
@@ -1846,14 +2002,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "El posibilidad de usar múltiples procesadores (también llamado "
 "<quote>multiprocesamiento simétrico</quote> o SMP) está disponible para ésta "
@@ -1917,13 +2081,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
-msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+#, 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;."
+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;."
+"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 "
@@ -2172,14 +2342,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, 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>"
+#, fuzzy, 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 "
+"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 ""
 "En algunos casos el controlador que necesita puede no estar disponible como "
 "paquete Debian. Deberá comprobar si existe código fuente disponible en "
@@ -2462,9 +2639,15 @@ msgstr "Adquisición de hardware específico para GNU/&arch-kernel;"
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
-msgid ""
-"There are several vendors, who ship systems with Debian or other "
+#, fuzzy, 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 "
@@ -2646,14 +2829,21 @@ msgstr "Medios de instalación"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "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 "
@@ -2816,10 +3006,17 @@ msgstr "Dispositivo de memoria USB"
 
 #. Tag: para
 #: hardware.xml:1767
-#, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2912,14 +3109,22 @@ msgstr "Sistemas de almacenamiento aceptados"
 
 #. Tag: para
 #: hardware.xml:1821
-#, 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="
+#, fuzzy, 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, "
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "Los discos de inicio de Debian contienen un núcleo construido para maximizar "
@@ -2933,11 +3138,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, 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 "
+#, fuzzy, 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 ""
 "Generalmente, el sistema de instalación de Debian permite el uso de "
diff --git a/po/es/install-methods.po b/po/es/install-methods.po
index 535bff483..4f3ea5903 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-05 16:48+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 22:57+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -58,14 +58,28 @@ msgstr "Juegos oficiales de CD-ROMs de &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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -90,7 +104,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -99,7 +125,7 @@ msgid ""
 "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 "
+"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."
@@ -148,25 +174,33 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, no-c-format
+#| msgid "Downloading Files from Debian Mirrors"
+msgid "Downloading Files from &debian; Mirrors"
 msgstr "Descarga de ficheros desde las réplicas de Debian"
 
 #. Tag: para
 #: install-methods.xml:85
-#, no-c-format
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "Para encontrar la réplica más cercana (y probablemente la más rápida), vea "
 "la <ulink url=\"&url-debian-mirrors;\">lista de réplicas de Debian</ulink>."
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Cuando descargue ficheros desde una réplica de Debian utilizando FTP, "
@@ -181,9 +215,15 @@ msgstr "Dónde encontrar las imágenes de instalación"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
-msgid ""
-"The installation images are located on each Debian mirror in the directory "
+#, fuzzy, 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 "
@@ -243,10 +283,14 @@ msgstr "Ficheros de instalación para GLAN Tank"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "El GLAN Tank requiere un núcleo y un ramdisk en una partición ext2 en el "
@@ -261,10 +305,14 @@ msgstr "Ficheros de instalación para Kurobox Pro"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "El Kurobox Pro requiere un núcleo y un ramdisk en una partición ext2 en el "
@@ -424,12 +472,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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 ""
 "Debe primero descargar las imágenes de disco de alguna de las réplicas de "
 "Debian antes de crear los disquetes, como se explica en <xref linkend="
@@ -586,10 +641,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "Estas herramientas pueden encontrarse en los CD-ROMs oficiales de Debian, "
 "bajo el directorio <filename>/tools</filename>."
@@ -602,10 +660,19 @@ msgstr "Escritura de imágenes de disco desde 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 "
+#, fuzzy, 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 "
 "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 "
@@ -646,12 +713,17 @@ msgstr "Escritura de imágenes de disco con <command>Disk Copy</command>"
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "Si está creando una imagen de disquete desde ficheros que estuvieron "
 "originalmente en el CD oficial de &debian-gnu;, entonces «Type» y «Creator» "
@@ -971,9 +1043,9 @@ msgid ""
 "classname> and its configuration file</phrase>."
 msgstr ""
 "Existe un fichero «todo en uno» <filename>hd-media/boot.img.gz</filename> "
-"que contiene todos los ficheros del instalador (incluyendo el núcleo) <phrase "
-"arch=\"x86\">al igual que <classname>syslinux</classname> y su fichero de "
-"configuración</phrase> <phrase arch=\"powerpc\">al igual que "
+"que contiene todos los ficheros del instalador (incluyendo el núcleo) "
+"<phrase arch=\"x86\">al igual que <classname>syslinux</classname> y su "
+"fichero de configuración</phrase> <phrase arch=\"powerpc\">al igual que "
 "<classname>yaboot</classname> y su fichero de configuración</phrase>."
 
 #. Tag: para
@@ -1030,14 +1102,23 @@ msgstr "# zcat boot.img.gz &gt;/dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -1090,7 +1171,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:685
-#, no-c-format
+#, fuzzy, 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 "
@@ -1101,7 +1194,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "Puesto que la mayoría de memorias USB vienen con una sola partición FAT16 ya "
 "configurada, probablemente no tendrá que reparticionarlo o reformatearlo. Si "
@@ -1217,10 +1310,18 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:768
-#, no-c-format
+#, fuzzy, 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 "
+"&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> "
@@ -1238,7 +1339,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1251,7 +1365,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "La mayoría de los dispositivos de memoria USB no vienen preconfigurados de "
 "forma que «Open Firmware» pueda arrancar desde éstos, así que tendrá que "
@@ -1393,12 +1507,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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 ""
 "Si necesita una imagen <filename>hd-media</filename>, debería copiar en este "
 "momento una imagen ISO de Debian (imagen de CD businesscard, netinst o "
@@ -1530,9 +1649,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:960
-#, no-c-format
+#, fuzzy, no-c-format
+#| 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>."
 msgid ""
-"Copy the following files from the Debian archives to a convenient location "
+"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 ""
@@ -1582,9 +1705,13 @@ 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:\\</filename>."
+"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"filename>."
 msgstr ""
 "Copie los siguientes ficheros de una imagen de CD de Debian a <filename>c:"
 "\\</filename>."
@@ -1612,14 +1739,24 @@ msgstr "Arranque del instalador desde el disco duro en Macs OldWorld"
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1636,12 +1773,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1691,10 +1840,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1822,10 +1976,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"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."
@@ -2103,13 +2260,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2245,10 +2433,16 @@ 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 "
+#, fuzzy, 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."
@@ -2262,10 +2456,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2464,11 +2671,17 @@ msgstr "Instalación automática"
 
 #. Tag: para
 #: install-methods.xml:1591
-#, no-c-format
+#, fuzzy, 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-"
+#| "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."
 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 "
+"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 ""
@@ -2480,16 +2693,22 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Automatic Installation Using the Debian Installer"
+msgid "Automatic Installation Using the &debian; Installer"
 msgstr ""
 "Utilizar el instalador de Debian para realizar una instalación automática"
 
 #. Tag: para
 #: install-methods.xml:1604
-#, no-c-format
-msgid ""
-"The Debian Installer supports automating installs via preconfiguration "
+#, fuzzy, 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."
diff --git a/po/es/installation-howto.po b/po/es/installation-howto.po
index b0647e6f9..eac536251 100644
--- a/po/es/installation-howto.po
+++ b/po/es/installation-howto.po
@@ -6,7 +6,7 @@
 # Changes:
 #   - Initial translation
 #       Javier Fernández-Sanguino, 2004
-#	Ruby Godoy
+# 	Ruby Godoy
 #
 #   - Updates
 #       TRANSLATOR
@@ -32,7 +32,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-09-29 22:23+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 23:24+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -116,12 +116,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "Algunos métodos de instalación requieren imágenes distintas a las de los CD. "
 "<phrase condition=\"unofficial-build\"> La <ulink url=\"&url-d-i;\">página "
@@ -196,11 +201,15 @@ msgstr "Disquete"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Puede descargar las imágenes de disquete para instalar Debian si no puede "
 "arrancar desde un CD. Necesitará las imágenes <filename>floppy/boot.img</"
@@ -274,10 +283,14 @@ msgstr "Dispositivo de memoria USB"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "También es posible realizar la instalación desde un dispositivo de "
@@ -287,14 +300,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -394,12 +416,21 @@ msgstr "Arrancar desde un disco duro"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -517,12 +548,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "Si tiene una partición DOS o Windows que quiera preservar, tenga cuidado con "
@@ -697,10 +734,13 @@ msgstr "Y finalmente&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"We hope that your &debian; installation is pleasant and that you find "
+"&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
 msgstr ""
 "Esperamos que su instalación de Debian sea satisfactoria y que encuentre "
 "útil Debian. Es posible que ahora quiera leer <xref linkend=\"post-install\"/"
diff --git a/po/es/partitioning.po b/po/es/partitioning.po
index 13a5b8424..a8a3e78bc 100644
--- a/po/es/partitioning.po
+++ b/po/es/partitioning.po
@@ -6,7 +6,7 @@
 # Changes:
 #   - Initial translation
 #       Rudy Godoy, 2005
-#	Javier Fernández-Sanguino, 2004, 2005
+# 	Javier Fernández-Sanguino, 2004, 2005
 #
 #   - Updates
 #       TRANSLATOR
@@ -32,7 +32,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-09-29 22:23+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 23:00+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -44,14 +44,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, no-c-format
+#| msgid "Partitioning for Debian"
+msgid "Partitioning for &debian;"
 msgstr "Particionado en Debian"
 
 #. Tag: title
 #: partitioning.xml:13
-#, no-c-format
-msgid "Deciding on Debian Partitions and Sizes"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "Decisiones sobre las particiones de Debian y sus tamaños"
 
 #. Tag: para
@@ -153,14 +155,21 @@ msgstr "Árbol de directorios"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "&debian-gnu; se basa en el <ulink url=\"&url-fhs-home;\">Estándar de "
 "jerarquía de los sistemas de ficheros</ulink> (FHS) en lo que se refiere a "
@@ -444,15 +453,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -519,9 +541,16 @@ msgstr "Esquemas recomendados para el particionado"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -553,17 +582,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Necesitará una partición <filename>/usr/local</filename> separada si planea "
 "instalar una gran cantidad de programas que no son parte del sistema Debian. "
@@ -871,15 +910,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, no-c-format
+#| msgid "Debian Partitioning Programs"
+msgid "&debian; Partitioning Programs"
 msgstr "Programas para particionar en Debian"
 
 #. Tag: para
 #: partitioning.xml:436
-#, no-c-format
-msgid ""
-"Several varieties of partitioning programs have been adapted by Debian "
+#, fuzzy, 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."
@@ -898,9 +943,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -1122,14 +1172,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "Puede tener que ajustar el tamaño de su partición para disponer de "
@@ -1222,12 +1280,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
@@ -1268,8 +1338,8 @@ msgstr ""
 "(<quote>grande</quote>), a través de CHS. Puede ver más información acerca "
 "de estos problemas con discos grandes en la <ulink url=\"&url-large-disk-"
 "howto;\">Documentación acerca de discos grandes</ulink>. Si está usando un "
-"esquema de traducción de cilindros, y su BIOS no tiene la extensión para "
-"el uso de discos grandes, su partición de arranque debe estar dentro de los "
+"esquema de traducción de cilindros, y su BIOS no tiene la extensión para el "
+"uso de discos grandes, su partición de arranque debe estar dentro de los "
 "primeros 1024 cilindros (según la visión <emphasis>traducida</emphasis> de "
 "la BIOS)."
 
@@ -1294,8 +1364,8 @@ msgstr ""
 "<emphasis>debe</emphasis> montar en <filename>/boot</filename>, ya que es en "
 "este directorio donde se almacenarán los núcleos de &arch-kernel;. Está "
 "configuración funcionará en cualquier sistema, sin importar si se utiliza "
-"traducción LBA o CHS, ni tampoco si su BIOS permite usar las extensiones para "
-"discos grandes."
+"traducción LBA o CHS, ni tampoco si su BIOS permite usar las extensiones "
+"para discos grandes."
 
 #. Tag: para
 #: partitioning.xml:688
@@ -1450,11 +1520,11 @@ msgstr ""
 "GPT de modo que la partición de arranque no tiene que ser necesariamente la "
 "primera o incluso estar en el mismo disco. Esto es conveniento si olvido "
 "asignar la partición y solamente se da cuenta después que ha formateado las "
-"otras particiones en su(s) disco(s). El particionador <command>partman"
-"</command> verifica la existencia de una partición EFI al mismo tiempo que "
+"otras particiones en su(s) disco(s). El particionador <command>partman</"
+"command> verifica la existencia de una partición EFI al mismo tiempo que "
 "verifica una partición <emphasis>raíz</emphasis> definida adecuadamente. "
-"Esto le da la oportunidad de corregir la estructura del disco antes de que se "
-"inicie la instalación de paquete. La forma más fácil de corregir esta "
+"Esto le da la oportunidad de corregir la estructura del disco antes de que "
+"se inicie la instalación de paquete. La forma más fácil de corregir esta "
 "omisión, es reducir la última partición del disco para hacer suficiente "
 "espacio libre para añadir una partición EFI."
 
diff --git a/po/es/post-install.po b/po/es/post-install.po
index d3e48689e..10b251470 100644
--- a/po/es/post-install.po
+++ b/po/es/post-install.po
@@ -6,10 +6,10 @@
 # Changes:
 #   - Initial translation
 #       Rudy Godoy, 2005
-#	Igor Tamara, 2007
-#	Steve Langasek
-#	Javier Fernández-Sanguino, 2004 - 2007
-#	
+# 	Igor Tamara, 2007
+# 	Steve Langasek
+# 	Javier Fernández-Sanguino, 2004 - 2007
+# 	
 #   - Updates
 #       TRANSLATOR
 #
@@ -34,7 +34,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-09-29 22:23+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 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"
@@ -122,7 +122,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -130,7 +139,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "Linux es una implementación de Unix. El <ulink url=\"&url-ldp;\"> Proyecto "
@@ -144,19 +153,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "Orientación sobre Debian"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "Debian es un poco diferente a otras distribuciones. Incluso si está "
@@ -168,15 +185,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "Sistema de paquetes de Debian"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -318,13 +351,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"filename>. To read about &debian;-specific issues for particular programs, "
 "look at <filename>/usr/share/doc/(package name)/README.Debian</filename>."
 msgstr ""
 "También encontrará mucha documentación útil en <filename>/usr/share/doc</"
@@ -337,19 +378,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "El <ulink url=\"http://www.debian.org/\">sitio web de Debian</ulink> "
 "contiene una gran cantidad de documentación sobre Debian. En particular, vea "
@@ -358,11 +413,11 @@ msgstr ""
 "manuals#quick-reference\">Referencia Debian</ulink>. Encontrará un índice de "
 "más documentación relacionada con Debian en el <ulink url=\"http://www."
 "debian.org/doc/ddp\">Proyecto de documentación de Debian</ulink>. La "
-"comunidad Debian se ayuda a sí misma; para suscribirse a una o más de "
-"las listas de correo de Debian, vea la página de <ulink url=\"http://www."
-"debian.org/MailingLists/subscribe\"> suscripción a las listas de correo</"
-"ulink>. Por último, aunque no por ello menos importante, podrá encontrar "
-"gran cantidad de información en los <ulink url=\"http://lists.debian.org/"
+"comunidad Debian se ayuda a sí misma; para suscribirse a una o más de las "
+"listas de correo de Debian, vea la página de <ulink url=\"http://www.debian."
+"org/MailingLists/subscribe\"> suscripción a las listas de correo</ulink>. "
+"Por último, aunque no por ello menos importante, podrá encontrar gran "
+"cantidad de información en los <ulink url=\"http://lists.debian.org/"
 "\">archivos de las listas de correo de Debian</ulink>."
 
 #. Tag: para
@@ -387,12 +442,17 @@ msgstr "Configurar su sistema para utilizar el correo electrónico"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "Hoy en día el correo electrónico es una parte muy importante de la vida de "
 "muchas personas. Dado que hay muchas opciones para configurarlo y que para "
@@ -452,17 +512,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "Al hacerse cada vez más populares los entornos de escritorio gráficos "
@@ -553,10 +624,14 @@ msgstr "Enviar correo electrónico fuera del sistema"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Como ya se ha mencionado, el instalador de Debian sólo se configura para "
@@ -596,13 +671,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "En este caso, sin embargo, posiblemente tenga que configurar herramientas "
 "individuales para enviar correctamente correos electrónicos. Una de estas "
@@ -833,11 +914,18 @@ msgstr "Compilar un nuevo núcleo"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -867,8 +955,8 @@ msgid ""
 "kernels (such as high memory support)"
 msgstr ""
 "utilizar opciones del núcleo que no están permitidas con los núcleos "
-"preparados, como puede ser el caso de compatibilidad con mucha memoria "
-"(más de 4GB)."
+"preparados, como puede ser el caso de compatibilidad con mucha memoria (más "
+"de 4GB)."
 
 #. Tag: para
 #: post-install.xml:523
@@ -911,9 +999,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -942,10 +1036,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -998,7 +1099,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -1010,7 +1124,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "Ahora puede configurar su núcleo. Ejecute <userinput>make xconfig</"
@@ -1089,10 +1203,10 @@ msgstr ""
 "ayuda para depurar problemas con el núcleo), y también se instalará "
 "<filename>/boot/config-&kernelversion;</filename>, con su configuración "
 "actual. Su nuevo paquete es también lo suficientemente listo como para "
-"actualizar automáticamente el gestor de arranque de su plataforma para "
-"que utilice la información de la imagen del núcleo, la cual le permita "
-"arrancar sin necesidad de ejecutarlo nuevamente. Deberá instalar también el "
-"paquete de módulos si lo ha construido."
+"actualizar automáticamente el gestor de arranque de su plataforma para que "
+"utilice la información de la imagen del núcleo, la cual le permita arrancar "
+"sin necesidad de ejecutarlo nuevamente. Deberá instalar también el paquete "
+"de módulos si lo ha construido."
 
 #. Tag: para
 #: post-install.xml:655
@@ -1107,9 +1221,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/es/preface.po b/po/es/preface.po
index bafb4269e..ff3cfaf11 100644
--- a/po/es/preface.po
+++ b/po/es/preface.po
@@ -31,7 +31,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-09-29 22:23+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-30 01:21+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -49,13 +49,19 @@ msgstr "Instalar &debian-gnu; &release; en &architecture;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Estamos encantados de que haya decidido probar Debian, le aseguramos que "
 "encontrará que la distribución GNU/&arch-kernel; de Debian es única. &debian-"
@@ -65,10 +71,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/es/preparing.po b/po/es/preparing.po
index 2f406196f..aa30c8144 100644
--- a/po/es/preparing.po
+++ b/po/es/preparing.po
@@ -6,11 +6,11 @@
 # Changes:
 #   - Initial translation
 #       Rubén Porras Campo, 2004
-#	Javier Fernández-Sanguino, 2004	
+# 	Javier Fernández-Sanguino, 2004	
 #
 #   - Updates
 #       Carlos Galisteo, 2007
-#	Rudy Godoy, 2004
+# 	Rudy Godoy, 2004
 #
 # Traductores, si no conocen el formato PO, merece la pena leer la
 # documentación de gettext, especialmente las secciones dedicadas a este
@@ -33,7 +33,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-09-29 22:23+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 23:11+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -51,9 +51,13 @@ msgstr "Antes de instalar &debian-gnu;"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -70,11 +74,15 @@ msgstr "Descripción del proceso de instalación"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "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 "
@@ -98,15 +106,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -115,12 +134,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
@@ -154,16 +172,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, no-c-format
+#| msgid "Create partitionable space for Debian on your hard disk."
+msgid "Create partitionable space for &debian; on your hard disk."
 msgstr "Cree un espacio particionable para Debian en su disco duro."
 
 #. Tag: para
 #: preparing.xml:73
-#, no-c-format
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "Localice y/o descargue el programa del instalador así como los ficheros de "
 "cualquier controlador especializado que su máquina necesite (excepto para "
@@ -171,9 +193,12 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "Cree las cintas/disquetes/memorias USB o instale los ficheros de arranque "
@@ -217,8 +242,9 @@ msgstr "Conecte uno o más DASDs (Direct Access Storage Device)."
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 "Cree y monte las particiones en las que instalará Debian."
 
 #. Tag: para
@@ -428,10 +454,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -442,10 +473,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "El documento que ahora está leyendo, que es la versión en desarrollo de la "
@@ -527,10 +562,14 @@ msgstr "Linux para &arch-title;"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "El Redbook de IBM que describe las distribuciones de Linux disponibles para "
@@ -798,8 +837,8 @@ msgid ""
 "Resolutions and color depths supported (these should be checked against your "
 "monitor's capabilities)."
 msgstr ""
-"Resoluciones e intensidad de colores aceptados (deberán contrastarse con "
-"las capacidades de su monitor)."
+"Resoluciones e intensidad de colores aceptados (deberán contrastarse con las "
+"capacidades de su monitor)."
 
 #. Tag: entry
 #: preparing.xml:484
@@ -1135,11 +1174,19 @@ msgstr "5 Gigabytes"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1197,12 +1244,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1255,16 +1312,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:759
-#, no-c-format
+#, 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, 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, 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 "
+"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."
+"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, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
@@ -1319,10 +1386,15 @@ msgstr "ARREGLAME: ¿escribir sobre discos HP-UX?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1361,11 +1433,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1380,10 +1459,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "Si su máquina tiene un sistema de ficheros FAT o NTFS, como el que usa DOS y "
@@ -1392,11 +1475,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1414,12 +1506,19 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:849
-#, no-c-format
+#, fuzzy, 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."
+"&debian; installation. Windows and other OS installations may destroy your "
+"ability to start &debian;, or encourage you to reformat non-native "
+"partitions."
 msgstr ""
 "Si va a instalar más de un sistema operativo en la misma máquina, deberá "
 "instalar todos los sistemas operativos antes de proceder con la instalación "
@@ -1439,7 +1538,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:862
-#, no-c-format
+#, fuzzy, 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, "
@@ -1447,8 +1556,8 @@ msgid ""
 "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."
+"can delete the placeholder with the &debian; partition tools later during "
+"the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 "Para que el OpenFirmware arranque &debian-gnu; automáticamente las "
 "particiones &arch-parttype; deben aparecer antes del resto de las "
@@ -1462,11 +1571,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "Si actualmente tiene un disco duro con una partición (una configuración "
 "común para ordenadores de escritorio) y desea un sistema multiarranque con "
@@ -1510,18 +1623,22 @@ msgstr "Instalar el sistema operativo nativo en su nueva partición."
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "Arrancar nuevamente en el sistema operativo nativo para verificar que todo "
 "esté bien, y descargar los ficheros de arranque del instalador de Debian."
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, fuzzy, no-c-format
+#| msgid "Boot the Debian installer to continue installing Debian."
+msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr ""
 "Arrancar el instalador de Debian para continuar la instalación de Debian."
 
@@ -1533,12 +1650,17 @@ msgstr "Particionado desde DOS o Windows"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "Es recomendable que use o bien el esquema mostrado a continuación o bien las "
 "herramientas nativas de Windows o DOS si está manipulando particiones FAT o "
@@ -1548,13 +1670,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1576,11 +1706,22 @@ msgstr "Reparticionado sin pérdidas cuando se inicia desde DOS, Win-32 u OS/2"
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1601,14 +1742,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 ""
 "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 "
@@ -1637,17 +1785,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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 ""
 "Lo primero que se necesita es una copia de <command>fips</command>, "
@@ -1679,8 +1838,8 @@ msgstr ""
 "documentación de <command>fips</command> para una lista de otros programas "
 "que puedan ayudarlo. Note que si tiene Windows 9x, debe ejecutar "
 "<command>defrag</command> desde éste, puesto que DOS no reconoce el sistema "
-"de ficheros VFAT, necesario para el uso de ficheros con nombres largos, "
-"y que utiliza Windows 95 y versiones posteriores."
+"de ficheros VFAT, necesario para el uso de ficheros con nombres largos, y "
+"que utiliza Windows 95 y versiones posteriores."
 
 #. Tag: para
 #: preparing.xml:1007
@@ -1713,11 +1872,17 @@ msgstr "Particionado para DOS"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1729,12 +1894,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "Aparentemente, cada vez que cree o modifique una partición para uso de DOS "
 "es una buena idea llenar los primeros sectores con ceros. Debería hacer esto "
@@ -1755,11 +1925,18 @@ msgstr "Particionado desde SunOS"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1905,10 +2082,18 @@ msgstr "Preinstalación de hardware y configuración del sistema operativo"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1931,13 +2116,21 @@ msgstr "Utilización del menú de configuración de la BIOS"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "La BIOS provee las funcionalidades básicas necesarias para arrancar su "
 "máquina y permitir al sistema operativo acceder a su hardware. Su sistema "
@@ -2072,7 +2265,16 @@ msgstr "Selección de dispositivo de arranque"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -2080,7 +2282,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "Muchos menús de configuración de la BIOS le permiten elegir el dispositivo "
 "que el sistema usará para arrancar. Configúrelo para buscar un sistema "
@@ -2737,17 +2939,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "Debe realizar algunos pasos de diseño y preparación antes de efectuar la "
 "instalación en sí. IBM ha publicado documentación que describe el proceso "
@@ -2888,8 +3102,8 @@ msgstr ""
 "habilitar la emulación de compatibilidad de teclado en la configuración de "
 "la BIOS. Haga esto solamente si el sistema de instalación falla al usar el "
 "teclado en modo USB. Igualmente, en algunos sistemas (especialmente en "
-"portátiles) deberá deshabilitar el uso de versiones anteriores de USB si "
-"su teclado no responde. Consulte el manual de su placa base y busque las "
+"portátiles) deberá deshabilitar el uso de versiones anteriores de USB si su "
+"teclado no responde. Consulte el manual de su placa base y busque las "
 "opciones <quote>Emulación de compatibilidad de teclado</quote> o "
 "<quote>Compatibilidad de teclado USB</quote>."
 
diff --git a/po/es/preseed.po b/po/es/preseed.po
index d50edefec..d1bc6e085 100644
--- a/po/es/preseed.po
+++ b/po/es/preseed.po
@@ -9,8 +9,8 @@
 #
 #   - Updates
 #       Igor Támara, 2008, 2009
-#	sgs
-#	Omar Campagne, 2010
+# 	sgs
+# 	Omar Campagne, 2010
 #
 # Traductores, si no conocen el formato PO, merece la pena leer la
 # documentación de gettext, especialmente las secciones dedicadas a este
@@ -33,7 +33,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-09-29 22:23+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 22:59+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -643,12 +643,26 @@ msgstr "Modo «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"
+#, fuzzy, 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 "
+"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 "
@@ -1059,14 +1073,22 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "También es posible utilizar DHCP para especificar un fichero de "
@@ -1107,13 +1129,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"automate &debian; installs should only be done with care."
 msgstr ""
 "Una buena forma de hacer uso de la preconfiguración de DHCP es sólo "
 "preconfigurar los valores específicos a su red, como puedan ser la réplica "
diff --git a/po/es/random-bits.po b/po/es/random-bits.po
index 52f481642..abe42d2d6 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-05 16:48+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 23:05+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -75,8 +75,8 @@ msgstr ""
 "al controlador de dispositivo (parte del núcleo de Linux) que a su vez le "
 "permite el acceso al hardware. Un tipo de fichero de dispositivo menos "
 "frecuente son las <firstterm>pipe</firstterm> (N. del T., a veces traducido "
-"como «tubería»). En la tabla a continuación se lista los ficheros "
-"de dispositivo más importantes."
+"como «tubería»). En la tabla a continuación se lista los ficheros de "
+"dispositivo más importantes."
 
 #. Tag: filename
 #: random-bits.xml:27
@@ -884,7 +884,16 @@ msgstr "Instalar &debian-gnu; desde un sistema Unix/Linux"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -893,7 +902,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "Esta sección explica cómo instalar &debian-gnu; desde un sistema Unix o "
 "Linux existente, sin usar el instalador basado en menús, como se explica en "
@@ -907,13 +916,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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 ""
 "Una vez que tenga el nuevo sistema Debian configurado a su preferencia, "
 "puede migrar los datos existentes de sus usuarios (si fuese el caso) a éste "
@@ -924,11 +939,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:383
-#, no-c-format
+#, fuzzy, 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 "
-"also require more knowledge of Debian and of &arch-kernel; in general than "
+"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 "
@@ -988,10 +1012,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -1043,17 +1077,28 @@ msgstr "Instalar <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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 ""
 "<command>debootstrap</command> es la herramienta que usa el instalador de "
 "Debian, es también la forma oficial de instalar un sistema base Debian. Éste "
@@ -1067,14 +1112,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1113,10 +1169,16 @@ msgstr "Ejecutar <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1181,13 +1243,20 @@ msgstr "Configurar el sistema base"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"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"
@@ -1283,7 +1352,48 @@ msgstr "Montar particiones"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1310,7 +1420,7 @@ msgid ""
 "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 "
+"</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"
@@ -1655,8 +1765,9 @@ msgstr "# apt-cache search &kernelpackage;"
 #: random-bits.xml:735
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
-msgstr "A continuación, instale el paquete del núcleo deseado usando el "
-"nombre del paquete."
+msgstr ""
+"A continuación, instale el paquete del núcleo deseado usando el nombre del "
+"paquete."
 
 #. Tag: screen
 #: random-bits.xml:739
@@ -1676,12 +1787,17 @@ msgstr "Configurar el gestor de arranque"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "Para poder arrancar su sistema &debian-gnu; deberá configurar su gestor de "
 "arranque para cargar el núcleo instalado en su nueva partición raíz. Tenga "
@@ -1691,12 +1807,22 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:753
-#, no-c-format
+#, fuzzy, 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>."
 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 "
+"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 "
@@ -1779,11 +1905,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1879,12 +2013,19 @@ msgstr "Instalar &debian-gnu; a través de una línea IP paralela (PLIP)"
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 "Esta sección explica cómo se puede instalar &debian-gnu; en un ordenador que "
 "carezca de tarjeta de red y que sólo tiene un ordenador actuando como "
@@ -1944,10 +2085,13 @@ msgstr "Requisitos"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr ""
 "Un sistema destino, llamado <emphasis>objetivo</emphasis>, donde se va a "
 "instalar Debian."
@@ -2394,11 +2538,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2412,11 +2563,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/es/using-d-i.po b/po/es/using-d-i.po
index c416b7d0f..dce5aa382 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-05 16:48+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 23:03+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -47,8 +47,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "Usar el instalador de Debian"
 
 #. Tag: title
@@ -59,9 +60,15 @@ msgstr "Funcionamiento del instalador"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
-msgid ""
-"The Debian Installer consists of a number of special-purpose components to "
+#, fuzzy, 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 "
@@ -401,8 +408,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Busca y monta un CD de instalación de Debian."
 
 #. Tag: term
@@ -444,10 +452,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr ""
 "Presenta una lista de los servidores de réplica del archivo de Debian. El "
 "usuario puede elegir la fuente que se utilizará para sus paquetes de "
@@ -541,12 +552,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "Permite al usuario particionar los discos conectados al sistema, crear "
 "sistemas de ficheros en las particiones seleccionadas y añadirlos a los "
@@ -749,11 +765,16 @@ msgstr "save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "Ofrece una forma para que el usuario pueda guardar información en un "
 "disquete, red, disco duro, u otros dispositivos cuando se encuentre ante un "
@@ -787,15 +808,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, no-c-format
+#| msgid "Setting up Debian Installer and Hardware Configuration"
+msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr "Configurar el instalador de Debian y configuración de hardware"
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -1002,11 +1034,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -1205,18 +1243,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, no-c-format
+#| msgid "Looking for the Debian Installer ISO Image"
+msgid "Looking for the &debian; Installer ISO Image"
 msgstr "Búsqueda de la imagen ISO del instalador de Debian"
 
 #. Tag: para
 #: using-d-i.xml:676
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Al instalar usando el método <emphasis>hd-media</emphasis>, habrá un momento "
 "en el que se requiera localizar y montar la imagen ISO del Instalador de "
@@ -1225,7 +1269,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1236,9 +1294,9 @@ msgid ""
 "<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."
+"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 ""
 "En primer lugar, <command>iso-scan</command> monta automáticamente todos los "
 "dispositivos de tipo bloque (p. ej. particiones) que tengan algún sistema de "
@@ -2142,13 +2200,19 @@ msgstr "Particionado manual"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "Una pantalla similar a la mostrada anteriormente se mostrará si elige "
 "particionar manualmente excepto que se mostrará su partición actual sin los "
@@ -3976,8 +4040,8 @@ msgid ""
 "use a network mirror as a source for packages. In most cases the default "
 "answer should be fine, but there are some exceptions."
 msgstr ""
-"Una pregunta que se hará durante la mayoría de instalaciones es si se "
-"desea o no usar una réplica en red como fuente de paquetes. En la mayoría de "
+"Una pregunta que se hará durante la mayoría de instalaciones es si se desea "
+"o no usar una réplica en red como fuente de paquetes. En la mayoría de "
 "oportunidades, la respuesta predeterminada es la adecuada, pero hay "
 "excepciones."
 
@@ -4399,13 +4463,19 @@ msgstr "Detección de otros sistemas operativos"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "El instalador intentará encontrar otros sistemas operativos instalados en la "
 "máquina antes de instalar un gestor de arranque. Se le informará al respecto "
@@ -4570,17 +4640,22 @@ msgstr ""
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "Nueva partición de Debian"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"will install itself at the beginning of the new &debian; partition and it "
+"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á "
@@ -4608,13 +4683,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "Si después de este paso no puede volver a arrancar Windows 9x (o DOS), "
 "necesitará usar un disco de arranque de Windows 9x (MS-DOS) y usar la orden "
@@ -4764,10 +4845,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4784,11 +4870,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
 msgstr ""
 "Es el sistema de ficheros raíz usado inicialmente para arrancar el núcleo. "
@@ -4823,12 +4915,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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 ""
 "Es el núcleo comprimido. Es una copia del fichero señalado en <filename>/etc/"
 "elilo.conf</filename>. En una instalación de Debian estándar será el fichero "
@@ -5110,9 +5207,13 @@ msgstr "Finalizar la instalación"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -5181,11 +5282,15 @@ msgstr "Reiniciar el sistema"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Se le pedirá que extraiga el medio de arranque (CD, disquete, etc.) que usó "
 "para arrancar el instalador. Tras esto el sistema reiniciará cargando su "
@@ -5231,11 +5336,15 @@ msgstr "Guardado de los registros de instalación"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "Si la instalación es satisfactoria, los ficheros creados durante el proceso "
 "de instalación se guardarán automáticamente en el directorio <filename>/var/"
diff --git a/po/es/welcome.po b/po/es/welcome.po
index 04df935a5..59fc917c1 100644
--- a/po/es/welcome.po
+++ b/po/es/welcome.po
@@ -33,7 +33,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 16:48+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-05 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"
@@ -45,17 +45,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "Bienvenido a Debian"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Este capítulo ofrece una visión general del Proyecto Debian y de &debian-"
 "gnu;. Si ya conoce la historia del Proyecto Debian y la distribución &debian-"
@@ -420,17 +425,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Linux?"
+msgid "What is &debian; GNU/Linux?"
 msgstr "¿Qué es Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
-#, no-c-format
+#, fuzzy, 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 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 "
+"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 "
@@ -453,9 +470,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -468,12 +490,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debian es especialmente popular entre los usuarios avanzados debido a su "
 "excelencia técnica y a sus comités siempre atentos a las necesidades y "
@@ -482,9 +509,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -496,9 +528,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -510,11 +547,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -530,15 +576,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "Para proteger su sistema contra <quote>caballos de Troya</quote> y otros "
 "programas malévolos, los servidores de Debian verifican que los paquetes "
@@ -551,15 +605,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "El método principal, y el mejor, para obtener ayuda con su sistema Debian "
 "GNU/Linux y comunicarse con los desarrolladores de Debian, es a través de "
@@ -571,22 +633,28 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:315
-#, no-c-format
-msgid "What is Debian GNU/kFreeBSD?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "¿Qué es Debian GNU/kFreeBSD?"
 
 #. Tag: para
 #: welcome.xml:317
-#, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+#, fuzzy, no-c-format
+#| msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr "Debian GNU/kFreeBSD es un sistema Debian GNU con el núcleo kFreeBSD."
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This port of Debian is currently only being developed for the i386 and "
+#| "amd64 architectures, although ports to other architectures is possible."
 msgid ""
-"This port of Debian is currently only being developed for the i386 and amd64 "
-"architectures, although ports to other architectures is possible."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
 "Actualmente, esta adaptación de Debian sólo se desarrolla para las "
 "arquitecturas i386 y amd64, aunque la adaptación a otras arquitecturas es "
@@ -594,9 +662,12 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:326
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+#| "information on Linux system may not apply to it."
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 "Tenga en cuenta que Debian GNU/kFreeBSD no es un sistema Linux, y por ello "
@@ -604,10 +675,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:331
-#, no-c-format
+#, fuzzy, no-c-format
+#| 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."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-"kfreebsd-gnu/\"> Debian GNU/kFreeBSD ports page</ulink> and the "
+"kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
 "Para más información consulte la <ulink url=\"http://www.debian.org/ports/"
@@ -616,20 +691,23 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "¿Qué es Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
-#, no-c-format
+#, fuzzy, no-c-format
+#| 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."
 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."
+"&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 es un sistema Debian GNU con el GNU Hurd &mdash; "
-"un conjunto de servidores ejecutándose sobre un micronúcleo GNU "
-"Mach. "
+"Debian GNU/Hurd es un sistema Debian GNU con el GNU Hurd &mdash; un conjunto "
+"de servidores ejecutándose sobre un micronúcleo GNU Mach. "
 
 #. Tag: para
 #: welcome.xml:357
@@ -647,20 +725,27 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:365
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+#| "information on Linux system may not apply to it."
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
-"Tenga en cuenta que Debian GNU/Hurd no es un sistema Linux, y por "
-"ello parte de la información sobre sistemas Linux no es válida."
+"Tenga en cuenta que Debian GNU/Hurd no es un sistema Linux, y por ello parte "
+"de la información sobre sistemas Linux no es válida."
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 "Para más información consulte <ulink url=\"http://www.debian.org/ports/hurd/"
@@ -669,19 +754,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "Obtener Debian"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Le sugerimos que consulte la <ulink url=\"&url-debian-distrib;\">página de "
 "distribución</ulink> para obtener información acerca de cómo obtener &debian-"
@@ -692,9 +784,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -733,12 +829,17 @@ msgstr "Estructura de este documento"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Este documento se ha creado para servir de manual a aquellos que usen Debian "
 "por primera vez. Se intenta hacer la menor cantidad de presunciones posibles "
@@ -747,12 +848,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "Los usuarios expertos pueden encontrar también interesante la información de "
 "referencia de este documento, que incluye los tamaños mínimos para la "
@@ -786,12 +892,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Haga una copia de seguridad de su sistema y efectúe una planificación y "
 "configuración de hardware antes de instalar Debian, de acuerdo al <xref "
@@ -822,15 +933,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "Realice la instalación real de acuerdo al <xref linkend=\"d-i-intro\"/>. "
@@ -855,11 +975,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "Una vez que tenga su sistema instalado, puede leer el <xref linkend=\"post-"
 "install\"/>. Dicho capítulo explica dónde buscar más información sobre Unix "
@@ -920,7 +1044,18 @@ msgstr "Sobre copyrights y licencias de software"
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -930,7 +1065,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Seguramente ha leído las licencias que acompañan a la mayoría del software "
 "comercial &mdash; generalmente afirman que sólo puede usar una copia del "
@@ -964,16 +1099,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "El proyecto Debian, como concesión pragmática a sus usuarios, ha decidido "
 "dejar disponibles algunos paquetes que no cumplen nuestro criterio de "
@@ -987,7 +1131,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -996,10 +1152,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "La mayoría de los programas en el sistema están bajo la <emphasis>Licencia "
 "Pública General</emphasis> de <emphasis>GNU</emphasis>, más comúnmente "
@@ -1016,13 +1172,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "En Debian se usan una gran cantidad de declaraciones sobre derechos de autor "
 "y licencias de programas. Puede encontrar el copyright de cada paquete "
@@ -1031,9 +1193,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/fi/administrivia.po b/po/fi/administrivia.po
index 53783aed2..b40af4f69 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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 2bfb00233..3b7cd6864 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -24,13 +24,19 @@ msgstr "&debian-gnu;in asennusohje"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Tässä oppaassa on asennusohjeet &debian-gnu; version &release; "
 "käyttöjärjestelmän (koodinimi <quote>&releasename;</quote>) asentamisesta "
@@ -40,17 +46,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/boot-installer.po b/po/fi/boot-installer.po
index b7fbdf894..e22b1aacd 100644
--- a/po/fi/boot-installer.po
+++ b/po/fi/boot-installer.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installation Guide boot-installer\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-02 10:57+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -103,10 +103,16 @@ msgstr "Käynnistäminen CD-levyltä"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -138,9 +144,15 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
 #: boot-installer.xml:1488 boot-installer.xml:1850
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -236,10 +248,34 @@ msgstr "Verkon kautta Linuxista/Unixista"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -334,12 +370,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, no-c-format
+#, fuzzy, 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 "
 "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> "
+"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:"
@@ -938,10 +982,24 @@ msgstr "Käynnistysruutu"
 
 #. Tag: para
 #: boot-installer.xml:715
-#, no-c-format
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1114,16 +1172,27 @@ msgstr "CD-levyn sisältö"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
 msgstr ""
 "Debianin asennus-CD:itä on kolmea perusmallia. <emphasis>Business Card</"
@@ -1166,9 +1235,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1331,10 +1407,14 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:986
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Nämä vaiheet käynnistävät Debianin käynnistyslataimen joka näyttää valikon, "
@@ -1349,11 +1429,16 @@ msgstr "Valinta 2: Käynnistäminen EFI Shell:stä"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "Jos valinta 1 ei jostain syystä toimi, käynnistä kone uudelleen ja kun EFI "
@@ -1432,9 +1517,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1603,11 +1694,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "Paina &enterkey;. Tällöin ydin ladataan ja käynnistetään. Ydin näyttää "
 "tavanomaiset käynnistysviestinsä ja niiden jälkeen tulee Debian Installerin "
@@ -1784,13 +1879,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "Käynnistyslatain näyttää kehotteensa sen jälkeen kun sen on noutanut ja "
 "käsitellyt asetustiedostonsa. Tässä eteenpäin asennuksessa on samat vaiheet "
@@ -1805,13 +1906,22 @@ msgstr "SGI:n käynnistäminen TFTP:llä"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -1994,9 +2104,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2094,7 +2210,28 @@ msgstr "NewWorld Macien käynnistäminen OpenFirmwaresta"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -2113,7 +2250,7 @@ msgid ""
 "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."
+"userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
 "Tiedostot <filename>vmlinux</filename>, <filename>initrd.gz</filename>, "
 "<filename>yaboot</filename>, ja <filename>yaboot.conf</filename> on "
@@ -2738,8 +2875,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Debianin asentimen parametrit"
 
 #. Tag: para
@@ -2936,9 +3074,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -3119,12 +3261,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 "Aseta arvoksi <userinput>tosi</userinput> ottaaksesi käyttöön tuen SATA RAID "
 "-levyille (kutsutaan myös nimillä ATA RAID, BIOS RAID ja fake RAID) "
@@ -3477,14 +3625,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "Asennin käyttää oletusarvoisesti http-protokollaa tiedostojen noutamiseen "
 "Debianin asennuspalvelimilta eikä vaihto ftp:hen ole mahdollista asennuksen "
@@ -3970,10 +4125,13 @@ msgstr "Levykkeen luotettavuus"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "Levykkeeltä Debianin asentavilla näyttäisi suurin ongelma olevan levykkeiden "
 "luotettavuus."
@@ -4469,14 +4627,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "Jos käytössä on toimiva Debian-järjestelmä, on helpoin tapa asennusraportin "
 "lähettämiseen pakettien <classname>installation-report</classname> ja "
diff --git a/po/fi/boot-new.po b/po/fi/boot-new.po
index 86b11af43..5c6f70cf9 100644
--- a/po/fi/boot-new.po
+++ b/po/fi/boot-new.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide boot-new\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-03-13 04:53+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -16,8 +16,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "Asennetun Debian-järjestelmän käynnistäminen"
 
 #. Tag: title
@@ -50,8 +51,8 @@ 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -64,11 +65,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -81,13 +89,25 @@ 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 "
+#, fuzzy, 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 "
+"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 "
@@ -565,11 +585,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/fi/hardware.po b/po/fi/hardware.po
index c06a6d26c..e723dafce 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -29,7 +29,7 @@ msgstr "Laitteistovaatimukset"
 #| "about hardware supported by GNU and Linux."
 msgid ""
 "This section contains information about what hardware you need to get "
-"started with Debian. You will also find links to further information about "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "Tässä luvussa on tietoa laitteista joilla pääsee alkuun Debianin kanssa. "
@@ -53,13 +53,13 @@ msgstr "Tuetut laitteet"
 #| "for more details on &arch-title; architecture systems which have been "
 #| "tested with Debian."
 msgid ""
-"Debian does not impose hardware requirements beyond the requirements of the "
-"Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "Debianin laitevaatimukset eivät ole ankarampia kuin Linuxin ytimen ja GNU-"
 "työkalusarjan vaatimukset. Niinpä kaikki laitealustat joille on siirretty "
@@ -88,9 +88,12 @@ msgstr "Tuetut laitealustat"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
 msgstr ""
 "Debianin GNU/Linux versio &release; tukee yhtätoista suoritinperhettä ja "
@@ -104,8 +107,9 @@ msgstr "Suoritinperhe"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Nimi Debianissa"
 
 #. Tag: entry
@@ -453,7 +457,7 @@ msgstr "tape"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -479,9 +483,9 @@ msgstr ""
 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."
+"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 ""
 "Tässä ohjeessa käsitellään asennusta <emphasis>&arch-title;</emphasis>-"
 "laitealustalle. Muiden Debianin tukemien laitealustojen tietoja kannattaa "
@@ -570,11 +574,16 @@ msgstr "Sekä AMD64- että Intel EM64T-suorittimet ovat tuettuja."
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Jokainen erilainen ARM-laitealusta vaatii oman ytimensä. Tästä syystä "
@@ -584,10 +593,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "Useimpia ARM-suorittimia voi käyttää joko big endian tai little endian -"
@@ -609,14 +622,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "Intelin I/O Processor (IOP) -tuoteperhettä löytyy useista tiedon "
 "tallennukseen ja käsittelyyn tarkoitetuista tuotteista. Debian tukee tällä "
@@ -712,10 +733,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 "QEMU emuloi laitealustaa Versatile, sillä voi siis kivasti testata ja ajaa "
 "Debiania ARM:lla jos käytettävissä ei ole rautaa."
@@ -756,24 +780,43 @@ 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>."
+#, fuzzy, 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\", "
+"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>."
 msgstr ""
 "On huomattava <emphasis>ettei</emphasis> Debian GNU/Linux\n"
 "&releasename; toimi 386-suorittimella tai sitä vanhemmilla\n"
@@ -836,22 +879,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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, "
 "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> </"
+"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>."
+"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>."
 msgstr ""
 "Debianin &arch-title;-siirros tukee seuraavia laitealustoja: <itemizedlist>\n"
 "<listitem>\n"
@@ -874,10 +932,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -900,17 +963,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"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>."
@@ -976,9 +1052,12 @@ msgstr "Ytimen muunnokset"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
 "Debianissa on powerpc-ytimestä kaksi muunnosta, suorittimen tyypin mukaan:"
@@ -1055,12 +1134,17 @@ msgstr "Suoritinarkkitehtuuri Power Macintosh (pmac)"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "Apple (ja hetken aikaa muutama muukin valmistaja &mdash; esimerkiksi Power "
 "Computing) teki PowerPC-suorittimeen pohjautuvan mallisarjan Macintosh-"
@@ -1489,18 +1573,29 @@ msgstr "Nubus PowerMac suoritinarkkitehtuuri (ei tuettu)"
 
 #. 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>."
+#, fuzzy, 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 "
+"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>."
 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ä "
@@ -1632,11 +1727,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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 Debianin julkaisu oli Etch ja sekin vain sun4m-"
 "järjestelmissä. Muiden 32-bittisten aliarkkitehtuurien tuki lopetettiin jo "
@@ -1726,11 +1825,18 @@ msgstr "Moniprosessorijärjestelmät"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1755,11 +1861,11 @@ msgstr ""
 #| "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 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>"
+"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 ""
 "Ydin voidaan optimoida yhden suorittimen järjestelmille korvaamalla Debianin "
 "vakioydin. <phrase arch=\"linux-any\">Jutustelua siitä miten tämä tehdään "
@@ -1770,11 +1876,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1788,23 +1901,33 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
+"not compiled with SMP support."
 msgstr ""
 "Debianin ytimiin suoritinmallille 486 arkkitehtuurille &arch-title; ei ole "
 "käännetty mukaan SMP-tukea."
 
 #. Tag: para
 #: hardware.xml:1172
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Monen suorittimen tuki &mdash; kutsutaan myös nimellä <quote>symmetric "
 "multiprocessing</quote> eli SMP &mdash; on saatavilla tälle "
@@ -1825,7 +1948,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1840,14 +1963,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "Monen suorittimen tuki &mdash; kutsutaan myös nimellä <quote>symmetric "
 "multiprocessing</quote> eli SMP &mdash; on saatavilla tälle "
@@ -1914,13 +2045,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, 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;."
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
+"&debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
 "Debianin tuki graafisille käyttöliittymille määräytyy pohjana olevan X.Org:n "
 "X11-järjestelmän tuesta. Useimmat AGP-, PCI- ja PCIe-näytönohjaimet toimivat "
@@ -2165,14 +2302,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, 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>"
+#, fuzzy, 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 "
+"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 ""
 "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 "
@@ -2454,9 +2598,15 @@ msgstr "Miten hankitaan laitteita erityisesti GNU/Linuxia varten"
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2638,14 +2788,21 @@ msgstr "Asennustaltiot"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "Tämä luku kertoo mitä eri asennustaltioita on käytettävissä Debianin "
 "asentamiseen. Esimerkiksi, jos tietokoneessa on levykeasema sitä voidaan "
@@ -2798,10 +2955,17 @@ msgstr "USB-muistitikku"
 
 #. Tag: para
 #: hardware.xml:1767
-#, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2893,14 +3057,22 @@ msgstr "Tuetut massamuistit"
 
 #. Tag: para
 #: hardware.xml:1821
-#, 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="
+#, fuzzy, 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, "
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "Debianin käynnistystaltioilla oleva ydin on tehty toimimaan mahdollisimman "
@@ -2913,11 +3085,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, 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 "
+#, fuzzy, 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 ""
 "Debianin asennusjärjestelmään kuuluu tuki levykkeille, IDE-levylle (toinen "
diff --git a/po/fi/install-methods.po b/po/fi/install-methods.po
index 09e246690..40bf3eeb2 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -28,14 +28,28 @@ msgstr "Viralliset &debian-gnu; romput"
 
 #. 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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -56,7 +70,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -65,7 +91,7 @@ msgid ""
 "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 "
+"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."
@@ -114,25 +140,33 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, no-c-format
+#| msgid "Downloading Files from Debian Mirrors"
+msgid "Downloading Files from &debian; Mirrors"
 msgstr "Tiedostojen noutaminen Debianin asennuspalvelimilta"
 
 #. Tag: para
 #: install-methods.xml:85
-#, no-c-format
+#, fuzzy, 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>."
+"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;\">Debianin asennuspalvelimien luettelosta</ulink>."
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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:tä käytettäessä muista noutaa tiedostot Debianin asennuspalvelimelta "
@@ -147,9 +181,15 @@ msgstr "Mistä asennusotokset löytyvät?"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -207,10 +247,14 @@ msgstr "GLAN Tank:n asennustiedostot"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "GLAN Tank vaatii ytimen ja muistilevyn ext2-osiolla, jonka on oltava sillä "
@@ -225,10 +269,14 @@ msgstr "Kurobox Pro:n asennustiedostot"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "Kurobox Pro vaatii ytimen ja muistilevyn ext2-osiolla, jonka on oltava sillä "
@@ -385,12 +433,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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 ""
 "Ennen kuin levykkeitä voi kirjoittaa, on ne ensin noudettava jostain "
 "Debianin asennuspalvelimesta, kuten selitetään kohdassa <xref linkend="
@@ -544,10 +599,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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>."
@@ -560,10 +618,19 @@ msgstr "Levykeotosten kirjoittaminen MacOS:ssä"
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -603,12 +670,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "Jos levykeotos luodaan tiedostoista jotka olivat alunperin virallisisilla "
 "&debian-gnu; -rompuilla, on kentillä Type ja Creator jo oikea arvo. "
@@ -984,14 +1056,23 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -1043,7 +1124,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:685
-#, no-c-format
+#, fuzzy, 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 "
@@ -1054,7 +1147,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "Koska useimmissa USB-muisteissa on tehtaan jäljiltä yksi FAT16-osio, ei "
 "liene tarpeen tehdä osioita uudestaan tai formatoida muistia. Jos niin "
@@ -1172,10 +1265,18 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:768
-#, no-c-format
+#, fuzzy, 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 "
+"&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> "
@@ -1192,7 +1293,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1205,7 +1319,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "Useimmat USB-muistit eivät tehtaan jäljiltä ole sellaisia että Open Firmware "
 "osaisi käynnistää niiltä, joten muistille on tehtävä uudet osiot. Mac-"
@@ -1344,12 +1458,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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 ""
 "Jos käytit <filename>hd-media</filename>-otosta, on nyt kopioitava Debianin "
 "ISO-otos (businesscard, netinst tai täysi CD-otos; varmista valitsevasi se "
@@ -1488,7 +1607,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1552,7 +1671,8 @@ 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:\\</filename>."
+"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"filename>."
 msgstr ""
 "Kopioi seuraavat tiedostot Debianin asennuspalvelimelta sopivaan kohtaan "
 "kiintolevylle, esimerkiksi hakemistoon <filename>/boot/newinstall/</"
@@ -1581,14 +1701,24 @@ msgstr "Kiintolevylle tallennetun asentimen käynnistäminen OldWorld Maceilla"
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1606,12 +1736,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1661,10 +1803,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1787,10 +1934,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "Jotkin vanhat HPPA-koneet (esim. 715/75) käyttävät RBOOTD:tä eikä BOOTP:tä. "
 "Debianissa on saatavilla paketti <classname>rbootd</classname>."
@@ -2070,13 +2220,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2210,10 +2391,16 @@ 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 "
+#, fuzzy, 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."
@@ -2227,10 +2414,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2435,8 +2635,8 @@ msgstr "Automaattinen asennus"
 #| "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 "
+"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 ""
@@ -2448,15 +2648,21 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Automatic Installation Using the Debian Installer"
+msgid "Automatic Installation Using the &debian; Installer"
 msgstr "Automaattinen asennus Debianin asentimella"
 
 #. Tag: para
 #: install-methods.xml:1604
-#, no-c-format
+#, fuzzy, 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 "
+"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."
diff --git a/po/fi/installation-howto.po b/po/fi/installation-howto.po
index 7397fd7b8..bf09718e3 100644
--- a/po/fi/installation-howto.po
+++ b/po/fi/installation-howto.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-guide 20060430 installation howto 36744\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-11-08 23:06+0200\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -88,12 +88,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "Jotkut asennustavat vaativat muita kuin CD-otoksia. <phrase condition="
 "\"unofficial-build\"> <ulink url=\"&url-d-i;\">&d-i; -seittisivusto</ulink> "
@@ -164,11 +169,15 @@ msgstr "Levyke"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Jos käynnistys CD-levyltä ei ole mahdollista, voidaan noutaa levykeotokset "
 "Debianin asentamiseksi. Tarvitaan <filename>floppy/boot.img</filename>, "
@@ -238,10 +247,14 @@ msgstr "USB-muisti"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "Asennus on mahdollista myös irrotettavalta USB-muistilaitteelta. Esimerkiksi "
@@ -250,14 +263,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -353,12 +375,21 @@ msgstr "Käynnistys kiintolevyltä"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -469,12 +500,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "Mikäli levyllä on ennestään DOS- tai Windows-osioita jotka halutaan "
@@ -639,10 +676,13 @@ msgstr "Ja lopuksi&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"We hope that your &debian; installation is pleasant and that you find "
+"&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
 msgstr ""
 "Toivomme Debianin asennuksen sujuvan mukavasti ja Debianin olevan "
 "hyödyllinen. Kannattaa lukea <xref linkend=\"post-install\"/>."
diff --git a/po/fi/partitioning.po b/po/fi/partitioning.po
index ed0a27d2a..70f42435d 100644
--- a/po/fi/partitioning.po
+++ b/po/fi/partitioning.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installation Guide partitioning\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-03-06 16:21+0200\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -16,14 +16,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, no-c-format
+#| msgid "Partitioning for Debian"
+msgid "Partitioning for &debian;"
 msgstr "Osiot Debianille"
 
 #. Tag: title
 #: partitioning.xml:13
-#, no-c-format
-msgid "Deciding on Debian Partitions and Sizes"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "Debianin osiot ja osioiden koot"
 
 #. Tag: para
@@ -120,14 +122,21 @@ msgstr "Hakemistopuu"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "&debian-gnu; noudattaa <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
 "Standard</ulink>-julkaisua hakemistojen ja tiedostojen nimeämisessä. "
@@ -402,15 +411,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -474,9 +496,16 @@ msgstr "Osiointisuositus"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -506,17 +535,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Jos asennetaan paljon ohjelmia muualta kuin Debian-jakelusta, saatetaan "
 "tarvita iso <filename>/usr/local</filename>-osio. Mikäli tietokone toimii "
@@ -801,15 +840,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, no-c-format
+#| msgid "Debian Partitioning Programs"
+msgid "&debian; Partitioning Programs"
 msgstr "Debianin osiointisovellukset"
 
 #. Tag: para
 #: partitioning.xml:436
-#, no-c-format
-msgid ""
-"Several varieties of partitioning programs have been adapted by Debian "
+#, fuzzy, 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."
@@ -827,9 +872,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -1039,14 +1089,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "Jos tietokoneessa on ennestään muu käyttöjärjestelmä kuten DOS tai Windows, "
@@ -1134,12 +1192,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/fi/post-install.po b/po/fi/post-install.po
index dd71e2717..6dab5375b 100644
--- a/po/fi/post-install.po
+++ b/po/fi/post-install.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installation guide post-install\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-01-19 17:09+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -90,7 +90,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -98,7 +107,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "Linux on eräs Unix-toteutus. Osoitteessa <ulink url=\"&url-ldp;\">Linux "
@@ -113,19 +122,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "Asennoidu oikein Debianiin"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "Debian eroaa jonkin verran muista jakeluista. Myös muita Linux-jakeluita "
@@ -136,15 +153,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "Debianin paketointijärjestelmä"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -284,13 +317,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"filename>. To read about &debian;-specific issues for particular programs, "
 "look at <filename>/usr/share/doc/(package name)/README.Debian</filename>."
 msgstr ""
 "Myöskin hakemistossa <filename>/usr/share/doc</filename> on runsaasti "
@@ -303,19 +344,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "<ulink url=\"http://www.debian.org/\">Debianin www-sivustolla</ulink> on "
 "paljon tietoa Debianista. Katso erityisesti <ulink url=\"http://www.debian."
@@ -350,12 +405,17 @@ msgstr "Järjestelmän asetukset sähköpostin käyttöönottoon"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "Sähköpostin on nykyään monien elämän tärkeä osa. Koska sähköpostin asetukset "
 "voidaan tehdä monella tavalla, ja koska oikeat asetukset ovat tärkeitä "
@@ -412,17 +472,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "Graafisten työpöytäympäristöjen suosion kasvaessa graafinen "
@@ -518,10 +589,14 @@ msgstr "Sähköpostien lähetys ulkomaailmaan"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Kuten aiemmin mainittiin, asennetun Debian-järjestelmän asetukset on tehty "
@@ -561,13 +636,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Saatat kuitenkin tuossa tapauksessa joutua tekemään yksittäisten "
 "varusohjelmien asetuksia jotta ne osaisivat lähettää sähköpostia oikein. "
@@ -794,11 +875,18 @@ msgstr "Uuden ytimen kääntäminen"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -870,9 +958,15 @@ msgstr "Ei pidä pelätä ytimen kääntämistä. Se on hauskaa ja hyödyllistä
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -901,10 +995,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -957,7 +1058,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -969,7 +1083,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "Nyt on tehtävä ytimen asetukset. Komenna <userinput>make xconfig</userinput> "
@@ -1061,9 +1175,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/fi/preface.po b/po/fi/preface.po
index 0c78cb47b..cb93554a6 100644
--- a/po/fi/preface.po
+++ b/po/fi/preface.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation-guide preface\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2006-09-01 11:05+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -27,13 +27,19 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Päätöksesi kokeilla Debiania ilahduttaa, ja olemme varmoja Debianin GNU/"
 "&arch-kernel;-jakelun osoittautuvan ainutlaatuiseksi. &debian-gnu; on "
@@ -43,10 +49,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/fi/preparing.po b/po/fi/preparing.po
index 046620735..f115bd954 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -22,9 +22,13 @@ msgstr "Ennen &debian-gnu;in asennusta"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -41,11 +45,15 @@ msgstr "Katsaus asennusprosessiin"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Ensin huomio uudelleenasennuksista. Tilanne joka vaatisi Debianin "
 "asentamisen kokonaan uudelleen on hyvin harvinainen; ehkäpä kiintolevyn "
@@ -68,15 +76,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -121,25 +140,32 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, no-c-format
+#| msgid "Create partitionable space for Debian on your hard disk."
+msgid "Create partitionable space for &debian; on your hard disk."
 msgstr "Luo Debianille osioitavaksi kelpaavaa tilaa kiintolevylle."
 
 #. Tag: para
 #: preparing.xml:73
-#, no-c-format
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "Etsi ja/tai nouda asennusohjelmisto ja tietokoneen tarvitsemat erikoisajurit "
 "(asennettaessa Debian-rompulta ei erikoisajureista tarvitse välittää)"
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "Valmistele käynnistysnauhat/-levykkeet tai USB-muistit, tai tallenna "
@@ -184,8 +210,9 @@ msgstr "Liitä yksi tai useampi DASD (Direct Access Storage Device)."
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 "Luo ja liitä ne osiot joihin Debian asennetaan."
 
 #. Tag: para
@@ -397,10 +424,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -410,10 +442,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "Ohje jota parhaillaan luet. Se on virallinen versio Debianin julkaisun "
@@ -492,10 +528,14 @@ msgstr "Linux suoritinperheelle &arch-title;"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "IBM Redbook joka kuvaa suurkoneelle saatavilla olevat Linux-jakelut. "
@@ -1089,11 +1129,19 @@ msgstr "5 gigatavua"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1149,12 +1197,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1219,11 +1277,11 @@ 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 "
+"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."
+"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, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> "
@@ -1283,10 +1341,15 @@ msgstr "FIXME: write about HP-UX disks?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1325,11 +1388,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1344,10 +1414,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "Jos tietokoneella on DOS:n ja Windowsin käyttämä FAT- tai NTFS-"
@@ -1356,11 +1430,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1388,8 +1471,9 @@ msgstr ""
 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."
+"&debian; installation. Windows and other OS installations may destroy your "
+"ability to start &debian;, or encourage you to reformat non-native "
+"partitions."
 msgstr ""
 "Jos tarkoituksena on asentaa tietokoneelle useampi kuin yksi "
 "käyttöjärjestelmä, olisi kaikki muut käyttöjärjestelmät asennettava ennen "
@@ -1426,8 +1510,8 @@ msgid ""
 "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."
+"can delete the placeholder with the &debian; partition tools later during "
+"the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 "Jotta OpenFirmware käynnistäisi &debian-gnu;in automaattisesti, olisi Linux-"
 "osioiden sijaittava ennen muita osioita, erityisesti ennen MacOS-"
@@ -1440,11 +1524,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "Jos koneessa on nyt yksi levy jolla on yksi osio (yleinen tapa "
 "pöytätietokoneissa), ja halutaan monikäynnistää koneen oma käyttöjärjestelmä "
@@ -1488,18 +1576,22 @@ msgstr "Asenna koneen oma käyttöjärjestelmä sen omaan osioon"
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "Käynnistä koneen oma käyttöjärjestelmä varmistuaksesi kaiken olevan "
 "kunnossa, ja noutaaksesi Debianin asentimen käynnistystiedostot."
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, fuzzy, no-c-format
+#| msgid "Boot the Debian installer to continue installing Debian."
+msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr "Käynnistä Debianin asennin jatkaaksesi Debianin asennusta."
 
 #. Tag: title
@@ -1510,12 +1602,17 @@ msgstr "Osiointi DOS:sta tai Windowsista"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "Muokattaessa olemassa olevia FAT- tai NTFS-osioita, suositellaan "
 "käytettäväksi alla olevaa osiointimallia tai Windowsin tai DOS:in omia "
@@ -1524,13 +1621,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1551,11 +1656,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1575,14 +1691,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 ""
 "Ennen jatkamista olisi päätettävä millaisiin osiin levy halutaan jakaa. "
 "Tässä luvussa kuvattu tapaa jakaa osion vain kahteen osaan. Toisessa on "
@@ -1609,17 +1732,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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 ""
 "Ensin tarvitaan ohjelma <command>fips</command>, joka on saatavilla "
@@ -1683,11 +1817,17 @@ msgstr "Osioiden teko DOS:lle"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1699,12 +1839,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "Näyttää siltä, että luotaessa DOS-osio tai muutettaessa DOS-osion kokoa, on "
 "tarpeen täyttää muutama ensimmäinen sektori nollilla. Tämä olisi tehtävä "
@@ -1725,11 +1870,18 @@ msgstr "Osiointi SunOS:stä"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1873,10 +2025,18 @@ msgstr "Laiteasetukset ja käyttöjärjestelmän asetukset ennen asennusta"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1899,13 +2059,21 @@ msgstr "BIOSin asetusvalikon käynnistäminen"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "BIOS toteuttaa perustoiminnallisuuden tietokoneen käynnistämiseen. Sen "
 "avulla käyttöjärjestelmä pääsee käsiksi laitteistoon. Luultavimmin "
@@ -2038,7 +2206,16 @@ msgstr "Käynnistyslaitteen valinta"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -2046,7 +2223,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "BIOS-valikoissa on usein mahdollista valita miltä laitteelta käynnistetään. "
 "Tee asetus siten, että käynnistettävää järjestelmää etsitään laitteelta "
@@ -2687,17 +2864,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "Ennen varsinaisen asennuksen aloittamista, on tehtävä joitakin suunnittelu- "
 "ja valmisteluvaiheita. IBM:ltä on saatavilla ohjeet koko prosessista, ts. "
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index d088b8c24..e8656dfaf 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -596,12 +596,26 @@ msgstr "Auto mode"
 
 #. 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"
+#, fuzzy, 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 "
+"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 "
@@ -1006,14 +1020,22 @@ msgstr "DHCP-palvelin kertomaan mistä valmiiden vastausten tiedosto löytyy"
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "DHCP:täkin voi käyttää kertomaan mistä päin verkkoa valmiit vastaukset "
@@ -1053,13 +1075,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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 "
diff --git a/po/fi/random-bits.po b/po/fi/random-bits.po
index 8c4360d96..190e95e7f 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -844,7 +844,16 @@ msgstr "&debian-gnu;in asentaminen Unix/Linux-järjestelmästä."
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -853,7 +862,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "Tämä luku selittää miten &debian-gnu; asennetaan koneessa jo olevasta Unix- "
 "tai Linux-järjestelmästä käyttämättä valikkopohjaista asenninta josta muut "
@@ -867,13 +876,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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 ""
 "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 "
@@ -896,7 +911,7 @@ msgstr ""
 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 "
+"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 "
@@ -953,10 +968,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -1005,17 +1030,28 @@ msgstr "Asennetaan <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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 ""
 "Debianin asentimen käyttämä työkaluohjelma on <command>debootstrap</"
 "command>. Se on virallinen tapa Debianin peruskokoonpanon asentamiseen. Se "
@@ -1030,14 +1066,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1075,10 +1122,16 @@ msgstr "Suoritetaan <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1140,13 +1193,20 @@ msgstr "Perusjärjestelmän asetukset"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 "Nyt on levyllä oikea Debian-järjestelmä, vaikkakin varsin suppea. Siirry "
 "siihen komennolla <command>chroot</command>: <informalexample><screen>\n"
@@ -1238,7 +1298,48 @@ msgstr "Liitetään osiot"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1265,7 +1366,7 @@ msgid ""
 "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 "
+"</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"
@@ -1633,12 +1734,17 @@ msgstr "Käynnistyslataimen asetukset"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "&debian-gnu; -järjestelmä saadaan käynnistyskelpoiseksi säätämällä "
 "käynnistyslatain lataamaan asennettu ydin ja käyttämään uutta "
@@ -1661,8 +1767,8 @@ msgstr ""
 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 "
+"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 "
@@ -1746,11 +1852,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1846,12 +1960,19 @@ msgstr "&debian-gnu;:in asennus käyttäen Parallel Line IP:tä (PLIP)"
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 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 "
@@ -1907,10 +2028,13 @@ msgstr "Vaatimukset"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr ""
 "Kohdekone, käytetään nimeä <emphasis>kohde</emphasis>, johon Debian "
 "asennetaan"
@@ -2343,11 +2467,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2361,11 +2492,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/fi/using-d-i.po b/po/fi/using-d-i.po
index 7ac3fe907..9c9c9c4f5 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -17,8 +17,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "Debianin asentimen käyttö"
 
 #. Tag: title
@@ -29,9 +30,15 @@ msgstr "Asentimen toiminta"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -350,8 +357,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Etsii ja liittää Debianin asennusrompun."
 
 #. Tag: term
@@ -390,10 +398,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr ""
 "Asennuspaketit valitaan noudettavaksi jostain luettelon Debianin "
 "asennuspalvelimista."
@@ -484,12 +495,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "Järjestelmän kiintolevyille tehdään osioita, luodaan tiedostojärjestelmiä "
 "valittuihin osioihin ja liitetään ne liitoskohtiin. Eikä tässä vielä kaikki, "
@@ -689,11 +705,16 @@ msgstr "tallenna lokit"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "Tarjoaa virhetilanteessa kirjoitusmahdollisuuden levykkeelle, verkkolevylle, "
 "kiintolevylle tai muulle taltiolle jotta myöhemmin voidaan lähettää tarkka "
@@ -724,15 +745,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, no-c-format
+#| msgid "Setting up Debian Installer and Hardware Configuration"
+msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr "Debianin asentimen asetusten teko ja laiteasetukset"
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -928,11 +960,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -1123,18 +1161,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, no-c-format
+#| msgid "Looking for the Debian Installer ISO Image"
+msgid "Looking for the &debian; Installer ISO Image"
 msgstr "Etsitään Debianin asentimen ISO-otosta"
 
 #. Tag: para
 #: using-d-i.xml:676
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Kun asennustapa on <emphasis>hd-media</emphasis> on tietyssä kohtaa "
 "löydettävä ja liitettävä Debianin asentimen ISO-otos josta saadaan loput "
@@ -1143,7 +1187,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1154,9 +1212,9 @@ msgid ""
 "<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."
+"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 ""
 "Ensin komento <command>iso-scan</command> liittää automaattisesti kaikki "
 "lohkolaitteet (ts. osiot) joilla on jokin tunnistettu tiedostojärjestelmä ja "
@@ -2033,13 +2091,19 @@ msgstr "Tee osiot itse"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "Yllä näytetyn kaltainen ruutu näytetään jos valitaan osioiden teko itse, "
 "paitsi että näytetään käytössä oleva osiotaulu ilman liitoskohtia. Tästä "
@@ -4219,13 +4283,19 @@ msgstr "Etsitään muita käyttöjärjestelmiä"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "Asennin etsii muita tietokoneelle asennettuja käyttöjärjestelmiä ennen kuin "
 "käynnistyslatain asennetaan. Jos tuettu käyttöjärjestelmä löytyy, tästä "
@@ -4379,17 +4449,22 @@ msgstr "Komento <command>LILO</command> ohjaa käynnistyksen kokonaan."
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "uusi Debianin osio"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"will install itself at the beginning of the new &debian; partition and it "
+"will serve as a secondary boot loader."
 msgstr ""
 "Valitse tämä jos haluat käyttää jotain muuta käynnistyslatainta. "
 "<command>LILO</command> asentuu uuden Debian-osion alkuun ja toimii "
@@ -4417,13 +4492,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "Jos Windows 9x:n (tai MS-DOS:n) käynnistäminen ei enää onnistu tämän "
 "jälkeen, on käytettävä Windows 9x:n (tai MS-DOS:n) käynnistyslevykettä ja "
@@ -4582,10 +4663,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4602,11 +4688,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
 msgstr ""
 "Tämä on ytimen käynnistyksessä käytettävä ensimmäinen "
@@ -4641,12 +4733,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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 ""
 "Tämä on varsinainen ydin pakatussa muodossa. Se on kopio tiedostosta joka "
 "mainitaan tiedostossa <filename>/etc/elilo.conf</filename>. Debianin "
@@ -4919,9 +5016,13 @@ msgstr "Päätetään asennus"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4986,11 +5087,15 @@ msgstr "Järjestelmän uudelleenkäynnistys"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Käynnistystaltion (romppu, levyke, jne) poistamisesta annetaan kehote. Sen "
 "jälkeen laite käynnistetään uudelleen uuteen Debian-järjestelmään."
@@ -5034,11 +5139,15 @@ msgstr "Asentimen lokien tallentaminen"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "Jos asennus onnistuu, asennuksen aikana kertyneet lokitiedostot tallennetaan "
 "automaattisesti uuden Debian-järjestelmän hakemistoon <filename>/var/log/"
diff --git a/po/fi/welcome.po b/po/fi/welcome.po
index f20d218c2..18d93a83e 100644
--- a/po/fi/welcome.po
+++ b/po/fi/welcome.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-11 08:46+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -18,17 +18,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "Tervetuloa Debianin pariin"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Tässä luvussa on katsaus Debian-projektiin ja &debian-gnu; -jakeluun. Jos "
 "olet jo perehtynyt Debian-projektin historiaan ja &debian-gnu; -jakeluun, "
@@ -375,17 +380,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Linux?"
+msgid "What is &debian; GNU/Linux?"
 msgstr "Mitä on Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
-#, no-c-format
+#, fuzzy, 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 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 "
+"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 "
@@ -408,9 +425,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -422,12 +444,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debianin teknisen erinomaisuuden ja tiukan sitoutumisen Linux-yhteisön "
 "odotuksiin ja tarpeisiin ansiosta se on erityisen suosittu edistyneempien "
@@ -435,9 +462,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -449,9 +481,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -463,11 +500,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -483,15 +529,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "Debianin palvelimet tarkistavat asennuspalvelimelle siirrettyjen pakettien "
 "tulevan paketin rekisteröidyltä ylläpitäjältä. Näin asentamaasi Debian-"
@@ -504,15 +558,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Ensisijainen ja paras tapa saada tukea Debian GNU/Linux -järjestelmälle ja "
 "tietojen vaihtoon Debianin kehittäjien kanssa ovat Debian-projektin "
@@ -525,28 +587,42 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Mikä on Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Debian GNU/Hurd on Debianin GNU-järjestelmä, jossa monoliittinen Linux-ydin "
+"on korvattu GNU Hurdilla, joukolla palvelimia, jotka toimivat GNU Mach -"
+"mikroytimen päällä. Hurd on vielä keskeneräinen ja sopimaton tavalliseen "
+"käyttöön, mutta työtä jatketaan. Hurdia kehitetään tällä hetkellä vain i386-"
+"arkkitehtuurille, mutta siirroksia muille arkkitehtuureille tehdään kunhan "
+"järjestelmä saadaan vakaammaksi."
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -559,7 +635,7 @@ msgstr ""
 #| "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 "
+"kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
 "Lisää voi lukea <ulink url=\"http://www.debian.org/ports/hurd/\">Debian GNU/"
@@ -568,16 +644,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "Mikä on Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -607,16 +684,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 "Lisää voi lukea <ulink url=\"http://www.debian.org/ports/hurd/\">Debian GNU/"
@@ -625,19 +706,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "Debianin hankkiminen"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Tietoa &debian-gnu; -jakelun noutamisesta Internetistä tai Debian-romppujen "
 "ostopaikoista löytyy <ulink url=\"&url-debian-distrib;\">Debianin "
@@ -647,9 +735,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -687,12 +779,17 @@ msgstr "Tämän ohjeen rakenne"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Tämä ohje on tarkoitettu käsikirjaksi ensimmäistä kertaa Debiania "
 "käyttäville. Lukijan asiantuntemuksen tasosta pyritään olettamaan "
@@ -701,12 +798,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "Asiantuntevat käyttäjätkin löytänevät kiinnostavia tiedonjyväsiä ohjeesta, "
 "muun muassa asennuksen vähimmäiskoosta, Debianin asennusjärjestelmän "
@@ -738,12 +840,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Tee varmuuskopiot, mahdollinen asennussuunnitelma ja laitteiston asetusten "
 "säätö ennen Debianin asentamista, luvussa <xref linkend=\"preparing\"/>. Jos "
@@ -772,15 +879,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "Varsinainen asennus tehdään luvun <xref linkend=\"d-i-intro\"/> ohjeilla. "
@@ -803,11 +919,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "Kun järjestelmän asennus on valmis, voidaan lukea luku <xref linkend=\"post-"
 "install\"/>. Luvusta ilmenee mistä löytyy lisätietoa Linuxista ja Debianista "
@@ -867,7 +987,18 @@ msgstr "Tekijänoikeuksista ja ohjelmistojen käyttöehdoista"
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -877,7 +1008,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Olet varmaankin lukenut joitakin useimpien kaupallisten ohjelmien mukana "
 "tulevista käyttöehdoista &mdash; tavallisesti ohjelmasta saa käyttää yhtä "
@@ -911,16 +1042,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "Debian-projekti tarjoaa myönnytyksenä käyttäjilleen muutamia paketteja jotka "
 "eivät ole projektin määritelmän mukaan vapaita. Nämä paketit eivät "
@@ -932,7 +1072,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -941,10 +1093,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "Monien järjestelmän ohjelmien käyttöehtona on <emphasis>GNU</emphasis> "
 "<emphasis>yleinen lisenssi</emphasis> (General Public Licence), johon usein "
@@ -960,13 +1112,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Muunkinlaisia tekijänoikeusilmoituksia ja ohjelmien käyttöehtoja on käytössä "
 "Debianissa olevissa ohjelmissa. Tekijänoikeudet ja käyttöehdot jokaiselle "
@@ -975,9 +1133,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/hu/administrivia.po b/po/hu/administrivia.po
index 49b65c769..c7cc14221 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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 12a230fad..db354f0f5 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -25,13 +25,19 @@ msgstr "&debian-gnu; Telepítési Útmutató"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "E dokumentum tartalmazza a telepítő leírást a &debian-gnu; &release; "
 "rendszerhez (kódnév: <quote>&releasename;</quote>) &arch-title; "
@@ -40,17 +46,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/boot-installer.po b/po/hu/boot-installer.po
index 6227dd954..27828c567 100644
--- a/po/hu/boot-installer.po
+++ b/po/hu/boot-installer.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-03-18 16:39+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -100,10 +100,16 @@ msgstr "Indítás CD-ROM lemezről"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -134,9 +140,15 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
 #: boot-installer.xml:1488 boot-installer.xml:1850
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -232,10 +244,34 @@ msgstr "Hálózaton Linux/Unix használatával"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -330,7 +366,7 @@ 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> "
+"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:"
@@ -919,7 +955,7 @@ msgstr "Az indító jel"
 #| "boot method and, optionally, boot parameters."
 msgid ""
 "When the installer boots, you should be presented with a friendly graphical "
-"screen showing the Debian logo and a menu: <informalexample><screen>\n"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1038,14 +1074,14 @@ msgstr ""
 #: boot-installer.xml:848
 #, no-c-format
 msgid ""
-"There are three basic variations of Debian Install CDs. The "
+"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 "
+"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 "
+"The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
 msgstr ""
 
@@ -1069,7 +1105,7 @@ msgstr ""
 #: boot-installer.xml:880
 #, no-c-format
 msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+"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 "
@@ -1186,8 +1222,8 @@ msgstr ""
 #: 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 "
+"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 ""
 
@@ -1203,7 +1239,7 @@ msgstr ""
 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 
@@ -1262,7 +1298,7 @@ msgstr ""
 #: boot-installer.xml:1049
 #, no-c-format
 msgid ""
-"As with option 1, these steps start the Debian boot loader which will "
+"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 "
@@ -1388,7 +1424,7 @@ msgstr ""
 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."
+"screen of the &debian; Installer."
 msgstr ""
 
 #. Tag: para
@@ -1512,7 +1548,7 @@ msgid ""
 "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."
+"start the &debian; Installer."
 msgstr ""
 
 #. Tag: title
@@ -1528,8 +1564,8 @@ 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 "
+"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."
@@ -1669,7 +1705,7 @@ msgstr ""
 #: boot-installer.xml:1512
 #, no-c-format
 msgid ""
-"OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
+"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 "
@@ -1769,7 +1805,7 @@ msgid ""
 "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."
+"userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
 
 #. Tag: title
@@ -2235,8 +2271,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Debian Telepítő paraméterek"
 
 #. Tag: para
@@ -2428,9 +2465,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -2613,7 +2654,7 @@ 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 
 #. Tag: term
@@ -2929,14 +2970,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "Alapban a telepítő http protokollt használ fájlok letöltésére Debian "
 "tükrökről és ftp protkollra cserélésre nincs mód telepítéskor normál "
@@ -3413,10 +3461,13 @@ msgstr "Flopi lemezek megbízhatósága"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "A Debian rendszert flopiról telepítők számára a legnagyobb gond a flopi "
 "megbízhatatlansága."
@@ -3886,14 +3937,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "Működő Debian rendszerből a telepítő jelentés küldésének legkönnyebb módja "
 "az <classname>installation-report</classname> és <classname>reportbug</"
diff --git a/po/hu/boot-new.po b/po/hu/boot-new.po
index 93e0c6b41..f78b7f912 100644
--- a/po/hu/boot-new.po
+++ b/po/hu/boot-new.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-03-04 08:51+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -19,8 +19,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "Az új Debian rendszer indítása"
 
 #. Tag: title
@@ -53,8 +54,8 @@ 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -65,11 +66,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -82,13 +90,25 @@ 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 "
+#, fuzzy, 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 "
+"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 "
@@ -564,11 +584,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/hu/hardware.po b/po/hu/hardware.po
index bdf16da38..576ad189c 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -26,10 +26,14 @@ msgstr "Rendszerkövetelmények"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "E fejezet leírja a Debian használatához szükséges hardvert. A GNU és &arch-"
@@ -54,13 +58,13 @@ msgstr "Támogatott hardver"
 #| "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 architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 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</"
@@ -94,7 +98,7 @@ msgstr "Támogatott architektúrák"
 #| "Debian GNU/Linux &release; supports twelve major architectures and "
 #| "several variations of each architecture known as <quote>flavors</quote>."
 msgid ""
-"Debian GNU/Linux &release; supports eleven major architectures and several "
+"&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
 msgstr ""
 "A Debian &release; 12 nagy architektúrát támogat és minden architektúra "
@@ -109,8 +113,9 @@ msgstr "Architektúra"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Debian megnevezés"
 
 #. Tag: entry
@@ -460,7 +465,7 @@ msgstr "szalag"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -486,9 +491,9 @@ msgstr ""
 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."
+"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 ""
 "E dokumentum leírja a Debian <emphasis>&arch-title;</emphasis> "
 "architektúrára telepítését. Ha más, Debian által támogatott architektúra "
@@ -570,11 +575,16 @@ msgstr "Az AMD64 és Intel EM64T processzorok is támogatottak."
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Minden ARM architektúra saját kernelt igényel. Ezért a szabvány Debian "
@@ -583,10 +593,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "A legtöbb ARM CPU bármely végű módban működik (nagy vagy kis). De a "
@@ -607,14 +621,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 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 "
@@ -699,7 +721,7 @@ msgstr "<term>sun4u</term>"
 #, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 
 #. Tag: para
@@ -735,24 +757,43 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:417
-#, no-c-format
+#, fuzzy, 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\", 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>."
+"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>."
 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 "
@@ -814,20 +855,20 @@ msgstr ""
 #: hardware.xml:484
 #, no-c-format
 msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+"&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> </"
+"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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -835,7 +876,7 @@ msgstr ""
 #, 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 "
+"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 ""
@@ -853,15 +894,15 @@ msgstr ""
 #: hardware.xml:542
 #, no-c-format
 msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+"&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 "
+"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 "
+"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>."
@@ -911,7 +952,7 @@ msgstr ""
 #: hardware.xml:618
 #, no-c-format
 msgid ""
-"There are two flavours of the powerpc kernel in Debian, based on the CPU "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
 
@@ -980,7 +1021,7 @@ 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 
 #. Tag: para
@@ -1393,16 +1434,16 @@ msgstr "Nubus PowerMac al-architektúra (nem-támogatott)"
 #: 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>."
+"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>."
 msgstr ""
 
 #. Tag: title
@@ -1507,9 +1548,9 @@ msgstr ""
 #: hardware.xml:1068
 #, 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."
+"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
@@ -1599,7 +1640,7 @@ msgstr "Többszörös processzorok"
 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 "
+"&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."
@@ -1622,11 +1663,11 @@ msgstr ""
 #| "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 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>"
+"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 ""
 "A kernel 1-CPUs rendszerekre optimalizálásához le kell cserélned az alap "
 "Debian kernelt. <phrase arch=\"linux-any\">Ennek egy kitárgyalását a <xref "
@@ -1648,7 +1689,7 @@ msgstr ""
 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-"
+"&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."
@@ -1662,23 +1703,33 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
+"not compiled with SMP support."
 msgstr ""
 "A Debian kernel-kép csomagok 486 kivitele &arch-title; architektúrához SMP "
 "támogatás nélkül fordított."
 
 #. Tag: para
 #: hardware.xml:1172
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "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ő "
@@ -1698,7 +1749,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1713,14 +1764,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "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ő "
@@ -1785,13 +1844,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, 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;."
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"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 és PCIe videó "
@@ -2023,14 +2088,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, no-c-format
+#, fuzzy, 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 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>"
+"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 ""
 "Pár esetben a szükséges meghajtó nem érhető el Debian csomagként. Ekkor "
 "utána kell nézni, van-e forráskód az interneten és le kell fordítani. Ennek "
@@ -2256,9 +2328,15 @@ msgstr "GNU/&arch-kernel; szempontok hardver vásárlásakor"
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2432,14 +2510,21 @@ msgstr "Telepítő média"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "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 "
@@ -2596,10 +2681,17 @@ msgstr "USB háttértároló"
 
 #. Tag: para
 #: hardware.xml:1767
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2690,14 +2782,22 @@ msgstr "Támogatott tárolók"
 
 #. Tag: para
 #: hardware.xml:1821
-#, no-c-format
+#, fuzzy, 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, which "
-"includes many drivers that won't be used for your machine<phrase arch="
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "A Debian indító lemezek kernelei úgy készülnek, hogy a lehető legtöbb "
@@ -2716,9 +2816,9 @@ msgstr ""
 #| "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 "
+"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 ""
 "Általánosságban a Debian telepítő rendszer támogatja a flopikat, IDE "
diff --git a/po/hu/install-methods.po b/po/hu/install-methods.po
index fffaa4fa4..63725962c 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -31,14 +31,28 @@ msgstr "Hivatalos &debian-gnu; CD-ROM készletek"
 
 #. 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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -54,7 +68,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -63,7 +89,7 @@ msgid ""
 "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 "
+"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."
@@ -108,16 +134,20 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, no-c-format
+#| msgid "Downloading Files from Debian Mirrors"
+msgid "Downloading Files from &debian; Mirrors"
 msgstr "Fájlok letöltése a Debian Tükrökről"
 
 #. Tag: para
 #: install-methods.xml:85
-#, no-c-format
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "A legközelebbi (és alighanem leggyorsabb) tükör megtalálásához lásd a <ulink "
 "url=\"&url-debian-mirrors;\">Debian tükrök</ulink> listáját."
@@ -129,7 +159,7 @@ msgstr ""
 #| "When downloading files from a Debian mirror, 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 "
+"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 ""
 "Fájlok letöltésekor egy Debian tükörről ügyelj, hogy az mindig "
@@ -144,9 +174,15 @@ msgstr "A telepítő képek fellelése"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -217,7 +253,7 @@ msgstr "CATS telepítő fájlok"
 #, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 
@@ -233,7 +269,7 @@ msgstr "RiscPC telepítő fájlok"
 #, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 
@@ -373,12 +409,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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 ""
 "Flopik létrehozása előtt le kell töltened őket egy Debian tükörről, ahogy "
 "itt írjuk: <xref linkend=\"downloading-files\"/>. <phrase arch=\"i386\">Ha "
@@ -526,10 +569,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "Ezek az eszközök a Hivatalos Debian CD-ROM lemezek <filename>/tools</"
 "filename> könyvtárában is megtalálhatók."
@@ -544,8 +590,8 @@ msgstr ""
 #: 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 "
+"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 "
@@ -577,7 +623,7 @@ 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 
 #. Tag: para
@@ -912,7 +958,7 @@ msgid ""
 "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 "
+"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 ""
@@ -986,7 +1032,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "Mivel bármilyen furcsa a legtöbb USB memórián eleve egy FAT16 partíció van, "
 "így nem biztos, hogy újra kell particionálnod, vagy formázni azt. Ha viszont "
@@ -1132,7 +1178,7 @@ msgstr ""
 #, 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 "
+"&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> "
@@ -1165,7 +1211,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "Mivel bármilyen furcsa a legtöbb USB memórián eleve egy FAT16 partíció van, "
 "így nem biztos, hogy újra kell particionálnod, vagy formázni azt. Ha viszont "
@@ -1267,9 +1313,9 @@ msgstr ""
 #, 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>)."
+"&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 ""
 
 #. Tag: title
@@ -1392,7 +1438,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1455,7 +1501,8 @@ 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:\\</filename>."
+"Copy the following files 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 "
 "merevlemezre, például ide: <filename>/boot/newinstall/</filename>."
@@ -1490,7 +1537,7 @@ msgid ""
 "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 "
+"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."
@@ -1503,7 +1550,7 @@ 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 "
+"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."
@@ -1537,7 +1584,7 @@ msgstr ""
 #, 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 "
+"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 ""
@@ -1647,10 +1694,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "Pár régibb HPPA gép (például a 715/75) RBOOTD-t használ BOOTP helyett. A "
 "Debian tartalmaz <classname>rbootd</classname> csomagot."
@@ -1925,13 +1975,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2065,8 +2146,8 @@ msgstr ""
 #: 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 "
+"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."
@@ -2076,8 +2157,8 @@ msgstr ""
 #: 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 "
+"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 "
@@ -2243,8 +2324,8 @@ msgstr "Automata telepítés"
 #| "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 "
+"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 ""
@@ -2256,15 +2337,21 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Automatic Installation Using the Debian Installer"
+msgid "Automatic Installation Using the &debian; Installer"
 msgstr "Automata telepítés a Debian Telepítő használatával"
 
 #. Tag: para
 #: install-methods.xml:1604
-#, no-c-format
+#, fuzzy, 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 "
+"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."
diff --git a/po/hu/installation-howto.po b/po/hu/installation-howto.po
index bfff77ad0..47e065a66 100644
--- a/po/hu/installation-howto.po
+++ b/po/hu/installation-howto.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installer Manual Installation HOWTO\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-02-22 22:43+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -87,12 +87,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "Egyes telepítő módok a CD-képektől eltérő képeket kívánnak. <phrase "
 "condition=\"unofficial-build\"> A <ulink url=\"&url-d-i;\">&d-i; honlap</"
@@ -163,11 +168,15 @@ msgstr "Floppi"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Ha nem tudsz CD lemezről indítani, akár flopiról is telepítheted a Debian "
 "rendszert. Szükség lesz majd a <filename>floppy/boot.img</filename> és "
@@ -238,10 +247,14 @@ msgstr "USB memória meghajtó"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "USB tároló eszközökről is telepíthetsz. Például egy USB kulcstartó egy igen "
@@ -249,14 +262,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -350,12 +372,21 @@ msgstr "Indítás merevlemezről"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -468,12 +499,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "Ha van egy létező DOS vagy Windows partíciód és valamiért meg akarod "
@@ -653,10 +690,13 @@ msgstr "És végül&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"We hope that your &debian; installation is pleasant and that you find "
+"&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
 msgstr ""
 "Reméljük, a Debian telepítésed igazán kellemes lett, és használatba véve "
 "jónak fogod találni a Debian rendszert. Érdemes elolvasni a <xref linkend="
diff --git a/po/hu/partitioning.po b/po/hu/partitioning.po
index d99e6627b..f3412845b 100644
--- a/po/hu/partitioning.po
+++ b/po/hu/partitioning.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-03-17 09:48+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -19,14 +19,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, no-c-format
+#| msgid "Partitioning for Debian"
+msgid "Partitioning for &debian;"
 msgstr "Particionálás a Debian számára"
 
 #. Tag: title
 #: partitioning.xml:13
-#, no-c-format
-msgid "Deciding on Debian Partitions and Sizes"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "A Debian partíciók és méretük eldöntése"
 
 #. Tag: para
@@ -122,14 +124,21 @@ msgstr "A könyvtárfa"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "A &debian-gnu; a <ulink url=\"&url-fhs-home;\">Fájlrendszer Hierarchia "
 "Szabvány</ulink>-t követi. E szabvánnyal a felhasználók és programok számára "
@@ -404,15 +413,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -474,9 +496,16 @@ msgstr "Ajánlott partíciós séma"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -506,17 +535,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Legyen külön <filename>/usr/local</filename> partíció, ha sok program "
 "telepítését tervezed forrásból, melyek valószínűleg nem részei a Debian "
@@ -800,15 +839,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, no-c-format
+#| msgid "Debian Partitioning Programs"
+msgid "&debian; Partitioning Programs"
 msgstr "Debian particionáló programok"
 
 #. Tag: para
 #: partitioning.xml:436
-#, no-c-format
-msgid ""
-"Several varieties of partitioning programs have been adapted by Debian "
+#, fuzzy, 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."
@@ -825,9 +870,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -1031,14 +1081,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "Ha van egy létező rendszered, netán DOS vagy Windows és valamiért meg "
@@ -1124,12 +1182,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/hu/post-install.po b/po/hu/post-install.po
index cac336f4a..c89d0cda5 100644
--- a/po/hu/post-install.po
+++ b/po/hu/post-install.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-01-22 00:51+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -92,7 +92,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -100,7 +109,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "A GNU/Linux alapjaiban egy Unix-szerű rendszer. A <ulink url=\"&url-ldp;"
@@ -113,19 +122,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "Hangolódj a Debian rendszerre"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "A Debian természetesen egyedi jellemzőket is tartalmaz. Valószínűleg már "
@@ -136,15 +153,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "A Debian csomagkezelő rendszer"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -282,13 +315,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"filename>. To read about &debian;-specific issues for particular programs, "
 "look at <filename>/usr/share/doc/(package name)/README.Debian</filename>."
 msgstr ""
 "Számos részletesebb dokumentáció van a  <filename>/usr/share/doc</filename> "
@@ -300,19 +341,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "A <ulink url=\"http://www.debian.org/\">Debian weblap</ulink> sok "
 "dokumentációt tartalmaz a Debian rendszerről. Lásd például a <ulink url="
@@ -348,12 +403,17 @@ msgstr "Az email beállítása"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "Ma, az email szinte minden ember életének egyik legfontosabb része. Sok "
 "lehetőség van beállítására, és mivel helyes beállítása pár Debian eszköz "
@@ -405,17 +465,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "A grafikus asztali rendszerek népszerűségének növekedésével a grafikus email "
@@ -507,10 +578,14 @@ msgstr "Email küldése kifelé"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Ahogy írtuk, egy frissen telepített Debian rendszer csak helyi email-"
@@ -547,13 +622,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "De ha ez nincs beállítva, egyes eszközöket egyénileg kell beállítani levelek "
 "helyes küldésére. Egy ilyen eszköz a <command>reportbug</command>, egy "
@@ -774,11 +855,18 @@ msgstr "Új rendszermag (kernel) fordítása"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -850,9 +938,15 @@ msgstr "Próbáld ki bátran a kernel-fordítást. Ez kellemes és ráadásul ha
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -881,10 +975,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -935,7 +1036,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -947,7 +1061,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "Most jöhet a kernel beállítása. Indíts egy <userinput>make xconfig</"
@@ -1038,9 +1152,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/hu/preface.po b/po/hu/preface.po
index eacc073f1..e9b773fc2 100644
--- a/po/hu/preface.po
+++ b/po/hu/preface.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-01-21 10:08+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -25,13 +25,19 @@ msgstr "A &debian-gnu; &release; telepítése &architecture;-felépítésű gép
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Örülünk annak, hogy úgy döntöttél, kipróbálod a Debian-t, és biztosak "
 "vagyunk benne, hogy a Debian alkotta GNU/&arch-kernel; terjesztést "
@@ -41,10 +47,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/hu/preparing.po b/po/hu/preparing.po
index cd8e56ccc..0ee2f7402 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -25,9 +25,13 @@ msgstr "A &debian-gnu; telepítése előtt"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -43,11 +47,15 @@ msgstr "A telepítő folyamat áttekintése"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "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 "
@@ -69,15 +77,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -120,25 +139,32 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, no-c-format
+#| msgid "Create partitionable space for Debian on your hard disk."
+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."
 
 #. Tag: para
 #: preparing.xml:73
-#, no-c-format
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "Töltsd le a telepítő szoftvert és ha kell, a gép által igényelt kiegészítő "
 "meghajtó fájlokat (a Debian CD-felhasználóknak nem kell)."
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "Hozd létre az indító szalagot/flopikat/USB meghajtókat, vagy töltsd le az "
@@ -183,8 +209,9 @@ msgstr "Csatolj egy vagy több DASD (Direct Access Storage Device) eszközt."
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 ""
 "Hozd létre és csatold a partíciókat, melyre a Debian rendszert telepíteni "
 "akarod."
@@ -392,10 +419,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -405,10 +437,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "E dokumentum, mely a Debian következő kiadásához tartozó Telepítő Útmutató "
@@ -487,10 +523,14 @@ msgstr "Linux &arch-title; architektúrára"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "Az IBM Redbook leírja a mainframe gépekre elérhető Linux-terjesztéseket. "
@@ -1077,11 +1117,19 @@ msgstr "5 gigabájt"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1134,12 +1182,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1203,11 +1261,11 @@ 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 "
+"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."
+"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/"
@@ -1266,10 +1324,15 @@ msgstr "FIXME: mi van a HP-UX lemezekkel?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1302,11 +1365,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1320,10 +1390,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "Ha a gépen 1 vagy több FAT vagy NTFS fájlrendszer van, melyet DOS és Windows "
@@ -1331,11 +1405,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1362,8 +1445,9 @@ msgstr ""
 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."
+"&debian; installation. Windows and other OS installations may destroy your "
+"ability to start &debian;, or encourage you to reformat non-native "
+"partitions."
 msgstr ""
 "Ha több rendszert is telepítesz egy gépre, és kezdő vagy ebben, akkor "
 "általában jobb, ha előbb a többi rendszert rakod fel Linuxod előtt. Az újabb "
@@ -1383,7 +1467,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:862
-#, no-c-format
+#, fuzzy, 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, "
@@ -1391,8 +1485,8 @@ msgid ""
 "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."
+"can delete the placeholder with the &debian; partition tools later during "
+"the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 "Annak érdekében, hogy az OpenFirmware automatikusan indítsa a &debian-gnu; "
 "rendszert, előbb a &arch-parttype; partícióknak meg kell előzniük másokat, "
@@ -1404,11 +1498,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "Ha 1 merevlemezed van 1 partícióval (általános az asztali gépeknél) és a "
 "Debian mellé más rendszert is akarsz, a lépések legegyszerűbb sora:"
@@ -1452,18 +1550,22 @@ msgstr "Telepítsd az adott rendszert új partíciójára."
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "Ellenőrizd, hogy az adott rendszer indul és töltsd le a Debian telepítő "
 "indító fájlokat."
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, fuzzy, no-c-format
+#| msgid "Boot the Debian installer to continue installing Debian."
+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
@@ -1474,12 +1576,17 @@ msgstr "Particionálás DOS-ban vagy Windowsból"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "Ha létező FAT vagy NTFS partíciót kezelsz, ajánlott az alábbi mód használata "
 "esetleg az azokat használó rendszerek beépített eszközeinek alkalmazása. "
@@ -1488,13 +1595,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1515,11 +1630,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1539,14 +1665,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 ""
 "Mielőtt továbbmennénk, el kell dönteni, hogyan legyen felosztva a lemez. "
 "Ebben a részben egyszerűen csak 2 újra osztunk egy partíciót. Egy az eredeti "
@@ -1573,17 +1706,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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 ""
 "Először szükség lesz egy <command>fips</command> programra, mely elérhető a "
@@ -1645,11 +1789,17 @@ msgstr "Particionálás DOS számára"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1660,12 +1810,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "Ha létrehozol vagy átméretezel egy partíciót DOS-hoz, nullázd az első pár "
 "szektort. Ezt megteheted a DOS <command>format</command> parancsát megelőzve "
@@ -1685,11 +1840,18 @@ msgstr "Particionálás SunOS alól"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1793,10 +1955,18 @@ msgstr "Telepítés-előtti hardver és operációs rendszer beállítás"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1818,13 +1988,21 @@ msgstr "A BIOS beállító menü behívása"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "A BIOS egy a gép indításához szükséges eszköz, vagyis egy olyan, mellyel "
 "indítható az operációs rendszer, mely hozzáfér a hardverhez. A hagyományos "
@@ -1956,7 +2134,16 @@ msgstr "Indító eszköz választás"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -1964,7 +2151,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "A legtöbb BIOS beállító menü lehetővé teszi a rendszert indító eszközök "
 "kiválasztását. Ez dönti el, milyen sorrendben keressen indítható operációs "
@@ -2501,17 +2688,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "Telepítés előtt egyes tervezési és előkészületi lépések szükségesek. Az IBM "
 "leírja az egész folyamatot, például, hogyan készítsünk elő egy telepítő "
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index c2135d2a8..6ebceb16f 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -572,12 +572,26 @@ msgstr "Automata mód"
 
 #. 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"
+#, fuzzy, 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 "
+"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 "
@@ -973,14 +987,22 @@ msgstr "Egy DHCP kiszolgáló használata elő-beállító fájlok megadására"
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "DHCP használatával megadható egy hálózatról letöltendő elő-beállító fájl is. "
@@ -1018,13 +1040,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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, "
diff --git a/po/hu/random-bits.po b/po/hu/random-bits.po
index 5c57f8bcb..9a3027e35 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -850,7 +850,16 @@ msgstr "A &debian-gnu; telepítése egy Unix/Linux rendszerből"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -859,7 +868,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "E szakasz leírja, hogyan telepítsd a &debian-gnu; rendszeredet létező Unix "
 "vagy Linux rendszer alól a menü-vezérelt telepítő nélkül, amit már leírtunk "
@@ -873,13 +882,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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 ""
 "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ó "
@@ -892,7 +907,7 @@ msgstr ""
 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 "
+"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 "
@@ -942,10 +957,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -993,17 +1018,28 @@ msgstr "A <command>debootstrap</command> telepítése"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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 ""
 "A Debian telepítő által használt eszköz, mely a Debian alaprendszer "
 "telepítésének hivatalos módja a <command>debootstrap</command>. A "
@@ -1017,14 +1053,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1061,10 +1108,16 @@ msgstr "Futtasd a <command>debootstrap</command> programot"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1134,13 +1187,20 @@ msgstr "Az alaprendszer beálíltása"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 "Most van egy igazi Debian rendszered - bár még csak rendkívül egyszerű - a "
 "lemezen. A <command>chroot</command> segítségével válts ebbe gyökeret: "
@@ -1218,7 +1278,48 @@ msgstr "Partíciók csatolása"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1245,7 +1346,7 @@ msgid ""
 "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 "
+"</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"
@@ -1662,12 +1763,17 @@ msgstr "A boot betöltő beállítása"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "A &debian-gnu; rendszer indíthatóvá tételéhez, állítsd be a boot betöltőt a "
 "telepített kernel indítására az új gyökér partícióval. A "
@@ -1689,8 +1795,8 @@ msgstr ""
 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 "
+"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 "
@@ -1767,11 +1873,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1865,12 +1979,19 @@ msgstr "A &debian-gnu; telepítése Parallel Line IP (PLIP) felett"
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 "E szakasz bemutatja, hogy telepítsük a &debian-gnu; rendszert hálózati "
 "tükörrel egy Ethernet kártya nélküli gépen, csak egy Null-Modem kábel (Null-"
@@ -1924,10 +2045,13 @@ msgstr "Követelmények"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr ""
 "A gép, melyet most így hívunk: <emphasis>cél</emphasis>, melyre a Debian "
 "rendszert most telepítjük."
@@ -2375,7 +2499,7 @@ msgstr ""
 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 "
+"<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."
@@ -2393,7 +2517,7 @@ msgstr ""
 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="
+"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."
diff --git a/po/hu/using-d-i.po b/po/hu/using-d-i.po
index 66e9df6d1..20a41d4a5 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -21,8 +21,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "A Debian Telepítő használata"
 
 #. Tag: title
@@ -33,9 +34,15 @@ msgstr "Hogyan működik a telepítő"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -359,8 +366,9 @@ msgstr "cdrom-detect (a CD-ROM felismerése)"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Debian telepítő CD-t keres és csatol."
 
 #. Tag: term
@@ -398,10 +406,13 @@ msgstr "choose-mirror (tükör-választás)"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"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."
@@ -491,12 +502,17 @@ msgstr "partman (partíció-kezelő)"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "Lehetővé teszi lemezek particionálását, fájlrendszerek létrehozását és "
 "csatolásukat. Olyan kiemelkedő képességeket is tartalmaz, mint teljesen "
@@ -691,11 +707,16 @@ msgstr "save-logs (naplók mentése)"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "Egy módot ad a felhasználónak adatok rögzítésére flopi lemezen, hálózaton, "
 "merevlemezen vagy más médián hiba esetén, hogy pontosan jelenthesse később a "
@@ -725,15 +746,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, no-c-format
+#| msgid "Setting up Debian Installer and Hardware Configuration"
+msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr "A Debian Telepítő és a hardver konfiguráció beállítása"
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -931,7 +963,7 @@ msgstr ""
 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 "
+"&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 ""
@@ -1105,18 +1137,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, no-c-format
+#| msgid "Looking for the Debian Installer ISO Image"
+msgid "Looking for the &debian; Installer ISO Image"
 msgstr "A Debian Telepítő ISO kép keresése"
 
 #. Tag: para
 #: using-d-i.xml:676
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Ha <emphasis>hd-media</emphasis> móddal telepítesz, akkor egy bizonyos "
 "pillanatban tudnod kell a Debian Telepítő ISO kép helyét és csatolni azt a "
@@ -1125,7 +1163,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1136,9 +1188,9 @@ msgid ""
 "<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."
+"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 ""
 "Először az <command>iso-scan</command> önműködően csatolja az össze blokk "
 "eszközt (például partíciókat) melyeken pár ismert fájlrendszer van és sorban "
@@ -1952,13 +2004,19 @@ msgstr "Particionáló séma"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "A fentihez hasonló jelenik meg kézi particionáláskor, de ekkor a létező "
 "partíciós táblát mutatja csatolási pontok nélkül. A partíciós tábla kézi "
@@ -4036,13 +4094,19 @@ msgstr "Más operációs rendszerek érzékelése"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "Egy boot betöltő telepítése előtt a telepítő megkísérli felismerni, milyen "
 "más rendszerek vannak már esetleg a gépen. Ha talál támogatottat, közli a "
@@ -4198,17 +4262,22 @@ msgstr ""
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "új Debian partíció"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"will install itself at the beginning of the new &debian; partition and it "
+"will serve as a secondary boot loader."
 msgstr ""
 "Válaszd ezt, ha más fő boot kezelőt használnál. A <command>LILO</command> "
 "ekkor az új Debian partíció elejére települ és másodlagos boot betöltőként "
@@ -4238,13 +4307,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "Ha többé nem tudod a Windows 9x (vagy DOS) rendszeredet indítani, egy "
 "Windows 9x (MS-DOS) indító lemezt kell használni és az <userinput>fdisk /"
@@ -4384,10 +4459,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4403,11 +4483,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
 msgstr ""
 "Ez a kernel betöltésére használt kezdő gyökér fájlrendszer. Ez a <filename>/"
@@ -4441,12 +4527,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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 ""
 "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 "
@@ -4712,7 +4803,7 @@ msgstr "A telepítés befejezése"
 #: using-d-i.xml:3053
 #, fuzzy, no-c-format
 msgid ""
-"This is the last step in the Debian installation process during which the "
+"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 ""
@@ -4778,7 +4869,7 @@ msgstr "A rendszer beállítása"
 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."
+"new &debian; system."
 msgstr ""
 "Ez a Debian telepítő folyamat utolsó lépése. Kér a telepítő indítására "
 "használt média (CD, floppy, és így tovább) eltávolítására. A telepítő "
@@ -4824,11 +4915,15 @@ msgstr "Telepítő naplók mentése"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"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/"
diff --git a/po/hu/welcome.po b/po/hu/welcome.po
index 647ceaa9c..a4d7df8fc 100644
--- a/po/hu/welcome.po
+++ b/po/hu/welcome.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-02-22 20:51+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian>\n"
@@ -19,17 +19,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "Üdvözlet a Debianban"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "E fejezet bemutatja a Debian projektet és a &debian-gnu; rendszert magát. Ha "
 "már ismered a Debian projekt történetét és a &debian-gnu; terjesztést, a "
@@ -384,17 +389,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Linux?"
+msgid "What is &debian; GNU/Linux?"
 msgstr "Mi a Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
-#, no-c-format
+#, fuzzy, 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 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 "
+"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 "
@@ -416,9 +433,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -431,12 +453,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "A Debian különösen népszerű a haladó felhasználók között kiemelkedő "
 "technikai színvonala és a Linux közösség szükségletei és várakozásai iránti "
@@ -445,9 +472,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -459,9 +491,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -473,11 +510,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -492,15 +538,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "Rendszered védelmére <quote>trójai</quote> és más rosszindulatú szoftverek "
 "ellen a Debian kiszolgálók igazolják, hogy a feltöltött csomagok bejegyzett "
@@ -512,15 +566,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "A legkiválóbb módszer a Debian GNU/Linux rendszer támogatásához és a "
 "fejlesztőkkel való párbeszédre a Debian Projekt által nyújtott "
@@ -533,28 +595,42 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Mi az a Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"A Debian GNU/Hurd egy Debian GNU rendszer, melyben a monolitikus Linux "
+"kernelt a GNU Hurd &mdash; egy a GNU Mach mikrokernel feletti kiszolgáló-"
+"készlet váltja. A Hurd még nincs kész, ezért nem való napi használatra, de "
+"töretlenül fejlődik. A Hurd fejlesztése jelenleg csak i386 architektúrán "
+"folyik, de a rendszer stabillá válásával más architektúrákon is elérhető "
+"lesz."
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -567,7 +643,7 @@ msgstr ""
 #| "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 "
+"kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
 "További adatokért lásd a <ulink url=\"http://www.debian.org/ports/hurd/\"> "
@@ -576,16 +652,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "Mi az a Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -615,16 +692,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 "További adatokért lásd a <ulink url=\"http://www.debian.org/ports/hurd/\"> "
@@ -633,19 +714,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "A Debian beszerzése"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "A &debian-gnu; letöltéséről vagy CD lemezek megvásárlásáról lásd a <ulink "
 "url=\"&url-debian-distrib;\">terjesztési weboldalt</ulink>. A <ulink url="
@@ -654,9 +742,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -694,12 +786,17 @@ msgstr "E dokumentum felépítése"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "E dokumentum elsősorban a most kezdő Debian felhasználóknak szól. Megpróbál "
 "igazodni egy kezdő lehetséges hozzáértési szintjeihez. Ezzel együtt "
@@ -708,12 +805,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "A haladó felhasználók is hasznos adatokat lelnek e dokumentumban, például a "
 "legkisebb telepítési méreteket, a Debian telepítő rendszer által támogatott "
@@ -744,12 +846,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "A korábbi rendszer esetleges mentése, szükséges tervezés és hardver "
 "összeállítás a Debian telepítése előtt, ez a <xref linkend=\"preparing\"/>. "
@@ -778,15 +885,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "Magát a telepítést a <xref linkend=\"d-i-intro\"/> írja le. Ennek része a "
@@ -810,11 +926,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "A telepítés megtörténtével érdekes olvasmány lehet a <xref linkend=\"post-"
 "install\"/>. Ez további hivatkozásokat ad úgy a Debian rendszerről, mint "
@@ -894,7 +1014,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Biztos olvastál már licenceket, melyek egyes kereskedelmi szoftverekkel "
 "érkeztek &mdash; ezek általában azt mondják, hogy a szoftver csak 1 "
@@ -929,16 +1049,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "A Debian projekt, mely a felhasználókkal gyakorlatias, egyes csomagokat "
 "engedékenyen elérhetővé tud tenni, melyek nem felelnek meg a szabad "
@@ -951,7 +1080,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -960,10 +1101,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "Rengeteg program a rendszerben a <emphasis>GNU</emphasis> <emphasis>General "
 "Public License</emphasis> nevű licenc alatt áll, melyre sokan sokszor csak "
@@ -978,13 +1119,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "A Debian rendszerben található programok többféle szerzői jogi formával is "
 "licenccel bírnak. A telepített csomagok szerzői jogi bejegyzéseit és "
@@ -993,9 +1140,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/ja/administrivia.po b/po/ja/administrivia.po
index 7753f203a..845ddaecf 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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 570da6c24..10937e066 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -22,13 +22,19 @@ msgstr "&debian-gnu; インストールガイド"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "この文書は &arch-title; (<quote>&architecture;</quote>) アーキテクチャ用 "
 "&debian-gnu; &release; システム (コードネーム <quote>&releasename;</quote>) "
@@ -37,17 +43,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 57fec05d8..025e5994e 100644
--- a/po/ja/boot-installer.po
+++ b/po/ja/boot-installer.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-05 18:28+0000\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"
@@ -101,10 +101,16 @@ msgstr "CD-ROM からの起動"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -134,9 +140,15 @@ msgstr ""
 #. Tag: para
 #: 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 "
+#, fuzzy, 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 "
@@ -231,10 +243,34 @@ msgstr "Linux/Unix を利用したネットワーク経由"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -328,12 +364,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, no-c-format
+#, fuzzy, 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 "
 "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> "
+"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:"
@@ -938,10 +982,24 @@ msgstr "ブート画面"
 
 #. Tag: para
 #: boot-installer.xml:715
-#, no-c-format
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1111,16 +1169,27 @@ msgstr "CD の内容"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"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 が 3 種類あります。<emphasis>Business Card</"
@@ -1161,9 +1230,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1325,10 +1401,14 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:986
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1342,11 +1422,16 @@ msgstr "オプション 2: EFI シェルからの起動"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "何らかの理由でオプション 1 が成功しない場合、マシンを再起動して EFI ブートマ"
@@ -1426,9 +1511,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
-msgid ""
-"As with option 1, these steps start the Debian boot loader which will "
+#, fuzzy, 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 "
@@ -1597,11 +1688,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "<command>ENTER</command> を押す。これでカーネルをロードし起動する。カーネル"
 "は Debian インストーラの第 1 画面に通常の初期化メッセージを表示する。"
@@ -1772,13 +1867,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "その設定ファイルをダウンロードし処理した後に、ブートローダは自身のプロンプト"
 "を表示します。ポイントは CD でインストールするのと同様の手順で、インストール"
@@ -1793,13 +1894,22 @@ msgstr "SGI の TFTP での起動"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -1981,9 +2091,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
-msgid ""
-"OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
+#, fuzzy, 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 "
@@ -2082,7 +2198,28 @@ msgstr "OpenFirmware からの NewWorld Mac の起動"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -2101,7 +2238,7 @@ msgid ""
 "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."
+"userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
 "既に <xref linkend=\"files-newworld\"/> において、<filename>vmlinux</"
 "filename>, <filename>initrd.gz</filename>, <filename>yaboot</filename>, "
@@ -2707,8 +2844,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Debian Installer パラメータ"
 
 #. Tag: para
@@ -2903,9 +3041,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -3084,12 +3226,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 "インストーラで、Serial ATA RAID (ATA RAID, BIOS RAID, fake RAID とも呼ばれ"
 "る) のサポートを有効にする場合 <userinput>true</userinput> にセットします。こ"
@@ -3432,14 +3580,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "デフォルトでインストーラは、Debian のミラーサイトからファイルをダウンロードす"
 "るのに http プロトコルを使用し、通常の優先度ではインストール中に ftp に変更で"
@@ -3923,10 +4078,13 @@ msgstr "フロッピーディスクの信頼性"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "フロッピーディスクを用いて Debian をインストールする人がつまずく最大の問題"
 "は、フロッピーディスクの信頼性だと思います。"
@@ -4418,14 +4576,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "動作する Debian システムがある場合、インストールレポートを送る最も簡単な方法"
 "は以下のようになります。<classname>installation-report</classname> と "
diff --git a/po/ja/boot-new.po b/po/ja/boot-new.po
index 34b7a8027..3a7d21448 100644
--- a/po/ja/boot-new.po
+++ b/po/ja/boot-new.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-07-03 14:27+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -16,8 +16,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "新しい Debian システムを起動させる"
 
 #. Tag: title
@@ -50,8 +51,8 @@ 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -64,11 +65,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -82,13 +90,25 @@ 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 "
+#, fuzzy, 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 "
+"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 "
@@ -565,11 +585,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/ja/hardware.po b/po/ja/hardware.po
index 55f8fcee1..baf22daf0 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -22,10 +22,14 @@ msgstr "必要なシステム"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "この節では、Debian を始めるために必要なハードウェアに関する情報を扱います。ま"
@@ -50,13 +54,13 @@ msgstr "サポートするハードウェア"
 #| "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 architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "Debian は、Linux カーネルや GNU ツールセットが必要とする以上のハードウェアを"
 "要求しません。それゆえ、Linux カーネル、libc、<command>gcc</command> などが移"
@@ -85,9 +89,12 @@ msgstr "サポートするアーキテクチャ"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&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>フレーバー"
@@ -101,8 +108,9 @@ msgstr "アーキテクチャ"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Debian での名称"
 
 #. Tag: entry
@@ -450,7 +458,7 @@ msgstr "tape"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -476,9 +484,9 @@ msgstr ""
 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."
+"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> アーキテクチャへのインストールを"
 "扱います。なお、他のアーキテクチャに関する情報については、<ulink url="
@@ -565,11 +573,16 @@ msgstr "AMD64 と Intel EM64t プロセッサの両方をサポートしてい�
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 アーキテクチャは自分自身のカーネルを必要とします。そのため、標"
@@ -579,10 +592,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "多くの ARM CPU は (ビッグ、リトルの) どちらのエンディアンモードでも動作しま"
@@ -603,14 +620,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "Intel の I/O プロセッサ (IOP) ラインは、データのストレージやプロセッシングに"
 "関係する製品の数だけ存在します。Debian では現在、ネットワーク接続ストレージ "
@@ -705,10 +730,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 "Versatile プラットフォームは QEMU でエミュレートされており、そのためハード"
 "ウェアがなくても ARM での Debian のテストや実行を行う良い方法です。"
@@ -747,24 +775,43 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:417
-#, no-c-format
+#, fuzzy, 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\", 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>."
+"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>."
 msgstr ""
 "しかし Debian GNU/Linux &releasename; は、386 以前のプロセッサでは<emphasis>"
 "動作しません</emphasis>。アーキテクチャ名が \"i386\" であるにもかかわらず、実"
@@ -818,22 +865,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
+#, fuzzy, 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> "
+"&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> </"
+"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>."
+"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>."
 msgstr ""
 "&arch-title; では、Debian は以下のプラットフォームをサポートしています。"
 "<itemizedlist> <listitem><para> SGI IP22: このプラットフォームには、Indy, "
@@ -852,10 +914,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -878,17 +945,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
+#, fuzzy, 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> "
+"&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 "
+"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 "
+"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>."
@@ -951,9 +1031,12 @@ msgstr "カーネルフレーバー"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
 "Debian では、以下の CPU タイプに基づいて、powerpc カーネルのフレーバーが 2 種"
@@ -1030,12 +1113,17 @@ msgstr "Power Macintosh (pmac) サブアーキテクチャ"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "Apple (そしてたとえば Power Computing のような他のメーカー) は、PowerPC プロ"
 "セッサベースの Macintosh コンピュータを製造しています。アーキテクチャのサポー"
@@ -1460,18 +1548,29 @@ msgstr "Nubus PowerMac サブアーキテクチャ (未サポート)"
 
 #. Tag: para
 #: hardware.xml:952
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "NuBus システムは現在 Debian/powerpc でサポートされていません。モノリシック "
 "Linux/PPC カーネルアーキテクチャでは、マシンをサポートしておらず、Debian では"
@@ -1605,11 +1704,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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 ビットサブアーキテクチャのサポート"
@@ -1700,11 +1803,18 @@ msgstr "マルチプロセッサ"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1727,11 +1837,11 @@ msgstr ""
 #| "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 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>"
+"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 ""
 "シングル CPU システムにカーネルを最適化したい場合は、Debian の標準カーネルを"
 "置き換える必要があります。<phrase arch=\"linux-any\">その手順に関する議論は "
@@ -1742,11 +1852,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1759,23 +1876,33 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
+"not compiled with SMP support."
 msgstr ""
 "&arch-title; 用 Debian カーネルイメージパッケージの 486 フレーバーでは、SMP "
 "をサポートするようコンパイルされていません。"
 
 #. Tag: para
 #: hardware.xml:1172
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "このアーキテクチャでは、マルチプロセッササポート (<quote>対称型マルチプロセッ"
 "シング</quote> や SMP と呼ばれている) が利用できます。しかし Debian "
@@ -1795,7 +1922,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1810,14 +1937,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "このアーキテクチャでは、マルチプロセッササポート (<quote>対称型マルチプロセッ"
 "シング</quote> や SMP と呼ばれている) が利用でき、コンパイル済みの Debian "
@@ -1884,13 +2019,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, 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;."
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"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 ビデオカードは X.Org の下"
@@ -2131,14 +2272,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, no-c-format
+#, fuzzy, 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 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>"
+"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 ""
 "いくつかの場合、必要なドライバが Debian パッケージとして利用できないことがあ"
 "ります。その場合、インターネットから利用できるソースコードがあるかどうか探"
@@ -2414,9 +2562,15 @@ msgstr "GNU/&arch-kernel; に適したハードウェアの購入"
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2596,14 +2750,21 @@ msgstr "インストールに利用できるメディア"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "本節は、Debian をインストールするのに、どのメディアを使用するかを決める助けと"
 "なるでしょう。例えば、マシンにフロッピーディスクドライブがあれば、Debian をイ"
@@ -2756,10 +2917,17 @@ msgstr "USB メモリ"
 
 #. Tag: para
 #: hardware.xml:1767
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2848,14 +3016,22 @@ msgstr "サポートする記憶装置"
 
 #. Tag: para
 #: hardware.xml:1821
-#, no-c-format
+#, fuzzy, 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, which "
-"includes many drivers that won't be used for your machine<phrase arch="
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "Debian の起動ディスクには、様々なシステムに最大限対応したカーネルが収められて"
@@ -2867,11 +3043,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, no-c-format
+#, fuzzy, 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 "
+"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 のインストーラは、フロッピー、 (PATA としても知られる) IDEド"
diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po
index 90d2742b0..3bb1468c2 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -28,14 +28,28 @@ msgstr "公式 &debian-gnu; CD-ROM セット"
 
 #. 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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -57,7 +71,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -66,7 +92,7 @@ msgid ""
 "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 "
+"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."
@@ -114,16 +140,20 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, 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
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "もっとも近い (そしておそらくもっとも速い) ミラーサイトを探すには、 <ulink "
 "url=\"&url-debian-mirrors;\">Debian ミラーサイト一覧</ulink> を参照してくださ"
@@ -131,9 +161,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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>"
@@ -148,9 +182,15 @@ msgstr "どこでインストールイメージを探すか"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -210,10 +250,14 @@ msgstr "GLAN Tank のインストールファイル"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "GLAN Tank では、Debian をインストールする予定のディスクにある ext2 パーティ"
@@ -228,10 +272,14 @@ msgstr "玄箱 Pro のインストールファイル"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "玄箱 Pro では、Debian をインストールする予定のディスクにある ext2 パーティ"
@@ -388,12 +436,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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\"/> で説明しているように、 ディスクイメージをダウンロード"
@@ -549,10 +604,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "以上のツールは、 公式 Debian CD-ROM の <filename>/tools</filename> にありま"
 "す。"
@@ -565,10 +623,19 @@ 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 "
+#, fuzzy, 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 "
 "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 "
@@ -608,12 +675,17 @@ msgstr "<command>Disk Copy</command> を用いたディスクイメージの書�
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "公式 &debian-gnu; CD にあったファイルからフロッピーイメージを作る場合は、 "
 "Type と Creator は既に適切な値になっています。 ここに示す <command>Creator-"
@@ -989,14 +1061,23 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -1047,7 +1128,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:685
-#, no-c-format
+#, fuzzy, 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 "
@@ -1058,7 +1151,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "ほとんどの USB メモリは、FAT16 パーティション 1 つであらかじめ設定されている"
 "ので、おそらく USB メモリのパーティション分割のやり直しや、再フォーマットは必"
@@ -1172,10 +1265,18 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:768
-#, no-c-format
+#, fuzzy, 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 "
+"&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> "
@@ -1192,7 +1293,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1205,7 +1319,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "ほとんどの USB メモリは、Open Firmware で起動できるようにあらかじめ設定されて"
 "いません。Mac システムでは、<userinput>mac-fdisk /dev/<replaceable>sdX</"
@@ -1342,12 +1456,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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 イメージの中から必要なものを選"
@@ -1485,7 +1604,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1547,7 +1666,8 @@ 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:\\</filename>."
+"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"filename>."
 msgstr ""
 "以下のファイルを、 Debian アーカイブからあなたのハードディスクの適当な場所 "
 "(例 <filename>/boot/newinstall/</filename>) にコピーしてください。"
@@ -1575,14 +1695,24 @@ msgstr "OldWorld Mac におけるハードディスクからのインストー�
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1599,12 +1729,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1654,10 +1796,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1784,10 +1931,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "古い HPPA マシンのいくつか (例えば 715/75) は、BOOTP ではなく RBOOTD を使いま"
 "す。 Debian には <classname>rbootd</classname> パッケージが用意されています。"
@@ -2063,13 +2213,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2200,10 +2381,16 @@ 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 "
+#, fuzzy, 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."
@@ -2216,10 +2403,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2423,8 +2623,8 @@ msgstr "自動インストール"
 #| "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 "
+"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 ""
@@ -2436,15 +2636,21 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, 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
+#, fuzzy, 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 "
+"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."
diff --git a/po/ja/installation-howto.po b/po/ja/installation-howto.po
index 1821b011b..fc5bae95f 100644
--- a/po/ja/installation-howto.po
+++ b/po/ja/installation-howto.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-07-03 14:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -86,12 +86,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "一部のインストール方法では、CD イメージ以外のイメージを必要とします。<phrase "
 "condition=\"unofficial-build\"> <ulink url=\"&url-d-i;\">&d-i; ホームページ</"
@@ -163,11 +168,15 @@ msgstr "フロッピー"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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/"
@@ -239,10 +248,14 @@ msgstr "USB メモリ"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "取り外し可能な USB 記憶装置からもインストールできます。例えば、USB メモリは、"
@@ -250,14 +263,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -351,12 +373,21 @@ msgstr "ハードディスクからの起動"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -468,12 +499,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "失いたくない既存の DOS か Windows パーティションがあるなら、パーティションの"
@@ -643,10 +680,13 @@ msgstr "そして最後に&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"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\"/>を読みたいと思ったかもしれませ"
diff --git a/po/ja/partitioning.po b/po/ja/partitioning.po
index de107d671..ce032d759 100644
--- a/po/ja/partitioning.po
+++ b/po/ja/partitioning.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-07-03 14:39+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -16,14 +16,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, 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"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "Debian のパーティションとそのサイズを決める"
 
 #. Tag: para
@@ -123,14 +125,21 @@ msgstr "ディレクトリツリー"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "ディレクトリとファイルの名前について、&debian-gnu; は <ulink url=\"&url-fhs-"
 "home;\">Filesystem Hierarchy Standard</ulink> に従っています。この規格を用い"
@@ -409,15 +418,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -482,9 +504,16 @@ msgstr "お勧めするパーティションルール"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -515,17 +544,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Debian のディストリビューションには含まれていないプログラムをたくさんインス"
 "トールするつもりなら、<filename>/usr/local</filename> パーティションが必要と"
@@ -823,15 +862,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, 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 "
+#, fuzzy, 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."
@@ -848,9 +893,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -1064,14 +1114,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "DOS または Windows のような他の既存のオペレーティングシステムがあり、Debian "
@@ -1162,12 +1220,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/ja/post-install.po b/po/ja/post-install.po
index 95a67d82f..3dbbf8157 100644
--- a/po/ja/post-install.po
+++ b/po/ja/post-install.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-07-03 14:40+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -92,7 +92,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -100,7 +109,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "Linux は Unix の実装の一つです。<ulink url=\"&url-ldp;\">Linux Documentation "
@@ -114,19 +123,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "Debian に慣れる"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "Debian は他のディストリビューションとは少々異なっています。他のディストリ"
@@ -138,15 +155,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "Debian パッケージングシステム"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -284,13 +317,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"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> にも有用な文書がたくさんあります。特に、"
@@ -302,19 +343,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "<ulink url=\"http://www.debian.org/\">Debian ウェブサイト</ulink> には、"
 "Debian に関するたくさんの文書があります。特に、<ulink url=\"http://www."
@@ -350,12 +405,17 @@ msgstr "電子メールを使用するためのシステム設定"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "今日では、電子メールは多くの人々にとって生活の重要な一部になっています。電子"
 "メールを使えるように設定するまでには、たくさんの選択肢があり、さらに電子メー"
@@ -410,17 +470,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "グラフィカルデスクトップシステムの人気の高まりとともに、GNOME の "
@@ -507,10 +578,14 @@ msgstr "システムの外に電子メールを送る"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 システムは、システム内のローカルな "
@@ -548,13 +623,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "しかしその場合には、電子メールを正しく送れるように個々のユーティリティを設定"
 "する必要があるかもしれません。そのようなユーティリティの一つに、Debian パッ"
@@ -777,11 +858,18 @@ msgstr "新しいカーネルのコンパイル"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -853,9 +941,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -883,10 +977,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -937,7 +1038,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -949,7 +1063,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "次にカーネルコンパイルの設定を行います。X11 のインストールおよび設定が済んで"
@@ -1042,9 +1156,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/ja/preface.po b/po/ja/preface.po
index 16791d0a3..691ba79ab 100644
--- a/po/ja/preface.po
+++ b/po/ja/preface.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-07-03 14:42+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -22,13 +22,19 @@ msgstr "&architecture; 用 &debian-gnu; &release; のインストール"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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; ディ"
 "ストリビューションは、他に類を見ないものであることを分かっていただけることで"
@@ -38,10 +44,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/ja/preparing.po b/po/ja/preparing.po
index d30bc323a..6b1ed6595 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -22,9 +22,13 @@ msgstr "&debian-gnu; のインストール前に"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -40,11 +44,15 @@ msgstr "インストールプロセスの概要"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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で、システムの完全な再"
 "インストールが必要になる状況は、非常にまれです。おそらく、もっともありそうな"
@@ -66,15 +74,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -117,25 +136,32 @@ msgstr "インストールを始める前に、コンピュータの情報と必
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, 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
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "インストーラと、そのマシンで必要な特殊なドライバファイルの場所を確認ないしダ"
 "ウンロードする。(Debian CD ユーザは不要)"
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "起動テープ・フロッピー・USB メモリを作る。または起動ファイルを配置する。(ほと"
@@ -179,8 +205,9 @@ msgstr "ひとつ以上の DASD (Direct Access Storage Device) にアタッチ�
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 をインストールするパーティションを作成し、マウントする。"
 
 #. Tag: para
@@ -389,10 +416,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -402,10 +434,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "現在ご覧になっている文書は、Debian の次期リリース用インストールガイドの開発版"
@@ -484,10 +520,14 @@ msgstr "Linux for &arch-title;"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "メインフレームで使える Linux ディストリビューションについて説明した IBM の仕"
@@ -1077,11 +1117,19 @@ msgstr "5 ギガバイト"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1134,12 +1182,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1205,11 +1263,11 @@ 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 "
+"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."
+"very least you will need a dedicated partition for the &debian; root."
 msgstr ""
 "システム上に既にオペレーティングシステム <phrase arch=\"x86\"> (Windows 9x, "
 "Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> "
@@ -1267,10 +1325,15 @@ msgstr "FIXME: HP-UX のディスクについては?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1309,11 +1372,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1327,10 +1397,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "DOS や Windows で使用していて、マシンに FAT・NTFS ファイルシステムがある場"
@@ -1339,11 +1413,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1360,12 +1443,19 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:849
-#, no-c-format
+#, fuzzy, 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."
+"&debian; installation. Windows and other OS installations may destroy your "
+"ability to start &debian;, or encourage you to reformat non-native "
+"partitions."
 msgstr ""
 "同じマシンに複数の OS をインストールするつもりでしたら、Debian をインストール"
 "する前に、他の OS を全部先にインストールしておきましょう。Windows などの他の "
@@ -1404,8 +1494,8 @@ msgid ""
 "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."
+"can delete the placeholder with the &debian; partition tools later during "
+"the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 "OpenFirmware に &debian-gnu; を自動的に起動させるには、&arch-parttype; パー"
 "ティションを他の OS のパーティション (特に MacOS のブートパーティション) より"
@@ -1419,11 +1509,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "現在ディスクがひとつ、パーティションもひとつ (デスクトップコンピュータだと普"
 "通の設定) になっていて、元の OS と Debian とのデュアルブートにしたい場合は、"
@@ -1466,18 +1560,22 @@ msgstr "その OS を、新しくつくったパーティションにインス�
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "新しく入れたその OS で起動しなおして、すべて問題ないか確かめる。問題なければ "
 "Debian インストーラの起動ファイルをダウンロードする。"
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, 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
@@ -1488,12 +1586,17 @@ msgstr "DOS や Windows からのパーティション分割"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "既存の FAT もしくは NTFS パーティションを扱う場合には、以降で説明する方法を用"
 "いるか、あるいは Windows や DOS のツールを用いることをお勧めします。扱わない"
@@ -1503,13 +1606,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1530,11 +1641,22 @@ msgstr "DOS, Windows, OS/2 から無駄なくパーティションを切り直�
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1554,14 +1676,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 ""
 "先に進む前に、ディスクをどのように分割するのか決めておかなければなりません。"
 "この節では 1 つのパーティションを 2 つに分割する方法のみ説明します。そのうち "
@@ -1589,17 +1718,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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> のコピーです。これはお近く"
@@ -1665,11 +1805,17 @@ msgstr "DOS のパーティションを分割する"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1681,12 +1827,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "どうやら DOS で使用するパーティションを作成したりその容量を変更したりする場合"
 "は、その最初のいくつかのセクタを 0 で埋めておくのが良いようです。DOS の "
@@ -1707,11 +1858,18 @@ msgstr "SunOS からのパーティション分割"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1854,10 +2012,18 @@ msgstr "インストール前に行うハードウェア・OS の設定"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1880,13 +2046,21 @@ msgstr "BIOS 設定メニューの起動"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "BIOS はマシンのブートに必要となる基本的機能を提供し、OS がハードウェアにアク"
 "セスできるようにするものです。これからインストールしようとしているマシンで"
@@ -2022,7 +2196,16 @@ msgstr "ブートデバイスの選択"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -2030,7 +2213,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "多くの BIOS 設定メニューでは、システムを起動するデバイスを選択できるように"
 "なっています。この設定は次のようにしましょう。まず起動可能なオペレーティング"
@@ -2670,17 +2853,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "実際にインストールを行うまえに、設計したり準備したりする段階をいくつか踏まな"
 "ければなりません。全体の手順、例えばインストールメディアの準備や、そのメディ"
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 953159b0e..a82d86c2d 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -577,12 +577,26 @@ 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"
+#, fuzzy, 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 "
+"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 "
@@ -972,14 +986,22 @@ msgstr "事前設定ファイルを指定するための DHCP の利用方法"
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "事前設定ファイルをネットワークからダウンロードするよう指定するのに、DHCP も使"
@@ -1017,13 +1039,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"automate &debian; installs should only be done with care."
 msgstr ""
 "DHCP preseed を使用するよい方法は、自分のネットワークには、Debian ミラーサイ"
 "トのような preseed の値のみ指定することです。自分のネットワークにこの方法でイ"
diff --git a/po/ja/random-bits.po b/po/ja/random-bits.po
index d688ddb9f..1b7f4efca 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -840,7 +840,16 @@ msgstr "Unix/Linux システムからの &debian-gnu; のインストール"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -849,7 +858,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "本節は、マニュアルの他の部分で説明されているメニュードリブンインストーラを使"
 "用せずに、既存の Unix・Linux システムから &debian-gnu; をインストールする方法"
@@ -862,13 +871,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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>0 ダウンタイム</"
@@ -877,11 +892,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:383
-#, no-c-format
+#, fuzzy, 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 "
-"also require more knowledge of Debian and of &arch-kernel; in general than "
+"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 "
@@ -938,10 +962,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -991,17 +1025,28 @@ msgstr "<command>debootstrap</command> のインストール"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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 ""
 "Debian インストーラが使用するユーティリティで、Debian 基本システムをインス"
 "トールする公式の方法と認められているのが <command>debootstrap</command> で"
@@ -1016,14 +1061,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1060,10 +1116,16 @@ msgstr "<command>debootstrap</command> の実行"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1124,13 +1186,20 @@ msgstr "基本システムの設定"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 "さあ、これでディスクに真の Debian システムを (いくぶん中がスカスカですが) 手"
 "に入れました。そこに <command>chroot</command> してください。"
@@ -1221,7 +1290,48 @@ msgstr "パーティションのマウント"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1248,7 +1358,7 @@ msgid ""
 "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 "
+"</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"
@@ -1608,12 +1718,17 @@ msgstr "ブートローダのセットアップ"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "&debian-gnu; システムを起動できるようにするために、インストールしたカーネルを"
 "新しい root パーティションから読み込むように、ブートローダをセットアップして"
@@ -1636,8 +1751,8 @@ msgstr ""
 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 "
+"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 "
@@ -1719,11 +1834,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1818,12 +1941,19 @@ msgstr "パラレルライン IP (PLIP) による &debian-gnu; のインスト�
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 "本節では、イーサネットカードがなくても、リモートゲートウェイコンピュータにヌ"
 "ルモデムケーブル (ヌルプリンタケーブルとも呼ばれます) で接続して &debian-"
@@ -1879,10 +2009,13 @@ msgstr "必要な物"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr ""
 "Debian をインストールする対象コンピュータ。(<emphasis>target</emphasis> と呼"
 "びます)"
@@ -2321,11 +2454,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2338,11 +2478,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/ja/using-d-i.po b/po/ja/using-d-i.po
index 2da65a488..d70000b6c 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -16,8 +16,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "Debian Installer の使用法"
 
 #. Tag: title
@@ -28,9 +29,15 @@ msgstr "インストーラの動作"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -346,8 +353,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Debian インストール CD を探しマウントします。"
 
 #. Tag: term
@@ -387,10 +395,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr ""
 "Debian アーカイブミラーのリストを表示します。インストールするパッケージの取得"
 "元を選択できるでしょう。"
@@ -479,12 +490,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "システムの内蔵ディスクを分割し、選択したパーティションのファイルシステムを作"
 "成し、マウントポイントにそのファイルシステムをマウントすることができます。完"
@@ -679,11 +695,16 @@ msgstr "save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "後で Debian 開発者へ、インストーラソフトウェアの障害を正確に報告するために、"
 "障害に遭遇した際の、フロッピーディスク、ネットワーク、ハードディスク、その他"
@@ -714,15 +735,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -915,11 +947,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -1105,18 +1143,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, no-c-format
+#| msgid "Looking for the Debian Installer ISO Image"
+msgid "Looking for the &debian; Installer ISO Image"
 msgstr "Debian Installer iso イメージの検索"
 
 #. Tag: para
 #: using-d-i.xml:676
-#, no-c-format
+#, fuzzy, 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."
+"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 Installer iso イメージを見つけてマウントする必"
@@ -1125,7 +1169,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1136,9 +1194,9 @@ msgid ""
 "<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."
+"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</"
@@ -2013,13 +2071,19 @@ msgstr "手動パーティション分割"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "手動パーティション分割を選択すると、既存のパーティションテーブルがマウントポ"
 "イントなしで表示されるのを除き、前述と同様の画面が表示されます。パーティショ"
@@ -4138,13 +4202,19 @@ msgstr "他 OS の検出"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "ブートローダがインストールされる前に、インストーラは既にインストールされてい"
 "る他の OS の検出を試します。サポートする OS を見つけると、ブートローダインス"
@@ -4300,17 +4370,22 @@ msgstr ""
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "new Debian partition"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"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 パーティションの先頭に自分自身をイ"
@@ -4340,13 +4415,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "このステップの後に Windows 9x (または DOS) を起動できなくなっていれば、"
 "Windows 9x (MS-DOS) のブートディスクを使用し、<userinput>fdisk /mbr</"
@@ -4491,10 +4572,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4510,11 +4596,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
 msgstr ""
 "カーネルを起動するときに使用する initial root ファイルシステム。<filename>/"
@@ -4548,12 +4640,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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 のインストールでは、シンボリックリン"
@@ -4826,9 +4923,13 @@ msgstr "インストールの完了"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4891,11 +4992,15 @@ msgstr "システムの再起動"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "インストーラの起動に使用したブートメディア (CD, floppy, etc) を、取り出すよう"
 "促されます。システムはこの後、新しい Debian システムで再起動します。"
@@ -4938,11 +5043,15 @@ msgstr "インストールログの保存"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "インストールが成功したら、インストールプロセス中のログファイルが、新しい "
 "Debian システムの <filename>/var/log/installer/</filename> に自動的に作成され"
diff --git a/po/ja/welcome.po b/po/ja/welcome.po
index f0c3a151c..3569ede87 100644
--- a/po/ja/welcome.po
+++ b/po/ja/welcome.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-07-03 17:47+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -16,17 +16,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "ようこそ Debian へ"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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; についてすでにご存知でしたら、この章を飛ばし"
@@ -366,17 +371,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, 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
+#, fuzzy, 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 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 "
+"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 "
@@ -398,9 +415,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -412,12 +434,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debian は、技術的な優越性や Linux コミュニティのニーズや期待への深いコミット"
 "メントによって、上級ユーザに特に人気があります。Debian はさらに、現在 Linux "
@@ -425,9 +452,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -438,9 +470,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -452,11 +489,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -471,15 +517,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "<quote>トロイの木馬</quote>や他の悪意あるソフトウェアからあなたのシステムを守"
 "るために、Debian のサーバは、アップロードされてきたパッケージが登録された "
@@ -491,15 +545,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "あなたの Debian GNU/Linux システムについてサポートを受けたり、Debian の開発者"
 "たちと連絡したりする第一の、そして最良の方法は、Debian プロジェクトが運営する"
@@ -512,28 +574,41 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Debian GNU/Hurd とは?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Debian GNU/Hurd は、Linux モノリシックカーネルを GNU Hurd &mdash; GNU Mach マ"
+"イクロカーネルの上で走る一群のサーバ &mdash; で置き換えた Debian GNU システム"
+"です。Hurd はまだ完成していません。現在のところ、i386 アーキテクチャでのみ開"
+"発されていますが、システムが安定してくれば、他のアーキテクチャにも移植される"
+"予定です。"
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -546,7 +621,7 @@ msgstr ""
 #| "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 "
+"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/hurd/\"> Debian GNU/Hurd "
@@ -555,16 +630,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "Debian GNU/Hurd とは?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -593,16 +669,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; 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 "
@@ -611,19 +691,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "Debian の入手"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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 の公式 CD を"
 "購入したりするための情報については、<ulink url=\"&url-debian-distrib;\">入手"
@@ -633,9 +720,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -673,12 +764,17 @@ msgstr "この文書の構成"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 をお使いになるユーザのために書かれたマニュアルで"
 "す。お手持ちのハードウェアの動作に関しては一般的な知識があることを前提として"
@@ -686,12 +782,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "また熟練したユーザであっても、この文書で、最低限インストールに必要な容量や、"
 "Debian インストールシステムでサポートされるハードウェアの詳細など、参考になる"
@@ -723,12 +824,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "<xref linkend=\"preparing\"/> では、既存のシステムをバックアップし、Debian の"
 "インストールに先だつシステム設計やハードウェアの設定を行います。もしマルチ"
@@ -757,15 +863,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "<xref linkend=\"d-i-intro\"/> に従って実際のインストールを実行してください。"
@@ -788,11 +903,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "システムのインストールが終了したら、<xref linkend=\"post-install\"/> を読んで"
 "下さい。この章では、Unix や Debian に関する情報の探し方や、カーネルの交換の方"
@@ -851,7 +970,18 @@ msgstr "著作権およびソフトウェアライセンスについて"
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -861,7 +991,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "この文書を読んでいる方は、多数の商用ソフトウェアにあるようなライセンス (購入"
 "したソフトウェアのコピー 1 部を、1 台のコンピュータで使用できる) はご存知のこ"
@@ -894,16 +1024,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "Debian プロジェクトでは、ユーザの実用性に関する妥協から、私たちのフリーの基準"
 "に適合しないパッケージも利用できるようになっています。これらは公式なディスト"
@@ -914,7 +1053,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -923,10 +1074,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "このシステムに入っているプログラムの多くは、<quote>GPL</quote> と略される "
 "<emphasis>GNU</emphasis> <emphasis>General Public License</emphasis> にした"
@@ -941,13 +1092,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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 に収録されたプログラムの著作権やソフトウェアライセンスの形式には、他に"
 "も数種あります。それぞれのプログラムの著作権やライセンスは、一度システムをイ"
@@ -956,9 +1113,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/ko/administrivia.po b/po/ko/administrivia.po
index cf86c31af..d4cf4c5f0 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -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 ""
@@ -201,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 5e26fa234..d9713fbb9 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -26,13 +26,19 @@ msgstr "&debian-gnu; 설치 안내서"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "이 문서는 &arch-title; (<quote>&architecture;</quote>) 아키텍처용 &debian-"
 "gnu; &release;시스템을 (코드명 <quote>&releasename;</quote>) 설치하는 절차가 "
@@ -41,17 +47,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 ""
 "이 설치 안내서는 예전의 데비안 설치 시스템(<quote>boot-floppies</quote>)용으"
 "로 쓰여진 예전 설명서를 기반으로 새로운 데비안 설치 프로그램에 관한 내용을 추"
diff --git a/po/ko/boot-installer.po b/po/ko/boot-installer.po
index de2da7eb2..ce9f33f4a 100644
--- a/po/ko/boot-installer.po
+++ b/po/ko/boot-installer.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-installer.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2009-08-28 02:33+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -106,10 +106,16 @@ msgstr "CD-ROM에서 부팅하기"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -139,9 +145,15 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
 #: boot-installer.xml:1488 boot-installer.xml:1850
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -235,10 +247,34 @@ msgstr "리눅스/유닉스를 사용해 네트워크를 통해"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -345,7 +381,7 @@ 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> "
+"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:"
@@ -928,10 +964,24 @@ msgstr "부팅 화면"
 
 #. Tag: para
 #: boot-installer.xml:715
-#, no-c-format
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1104,16 +1154,27 @@ msgstr "CD 내용"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
 msgstr ""
 "세 가지 종류의 데비안 설치 CD가 있습니다. <emphasis>Business Card</emphasis> "
@@ -1151,9 +1212,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1307,10 +1375,14 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:986
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "데비안 부트로더가 시작하고 부팅 커널과 옵션을 선택하는 메뉴 페이지를 표시합니"
@@ -1324,11 +1396,16 @@ msgstr "방법 2: EFI Shell에서 부팅"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "어떤 이유에서든 방법 1이 실패하면, 컴퓨터를 다시 부팅하십시오. EFI Boot "
@@ -1406,9 +1483,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1570,11 +1653,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "<command>ENTER</command>를 누르십시오. 그러면 커널을 읽어들여서 시작합니다. "
 "커널에서 초기화 메시지를 표시한 다음에 데비안 설치 프로그램의 첫번째 화면이 "
@@ -1743,13 +1830,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "부트로더에서 설정 파일을 다운로드하고 관련된 처리를 한 다음 프롬프트를 표시합"
 "니다. 여기까지 오면, CD 설치와 마찬가지로 설치를 진행합니다. 위에서와 같이 부"
@@ -1764,13 +1857,22 @@ msgstr "SGI TFTP 부팅"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -1951,9 +2053,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2054,7 +2162,28 @@ msgstr "OpenFirmware에서 뉴월드 맥 부팅하기"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -2073,7 +2202,7 @@ msgid ""
 "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."
+"userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
 "<xref linkend=\"files-newworld\"/>의 <filename>vmlinux</filename>, "
 "<filename>initrd.gz</filename>, <filename>yaboot</filename>, "
@@ -2673,8 +2802,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "데비안 설치 프로그램 파라미터"
 
 #. Tag: para
@@ -2866,9 +2996,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -3050,12 +3184,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 "<userinput>true</userinput>로 설정하면 설치 프로그램에서 시리얼 ATA RAID 디스"
 "크를 지원합니다. (ATA RAID, BIOS RAID, 가짜 RAID라고도 합니다.) 이 기능은 아"
@@ -3381,14 +3521,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "기본값으로 설치 프로그램은 데비안 미러에서 파일을 다운로드하는 HTTP 프로토콜"
 "을 사용하고, \"보통\" 우선순위에서는 설치 중에 프로토콜을 FTP로 바꿀 수 없습"
@@ -3877,10 +4024,13 @@ msgstr "플로피 디스크 신뢰성"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "플로피 디스크를 사용해 설치하는 사람이 겪는 가장 큰 문제는 플로피 디스크 신뢰"
 "성 문제일 것입니다."
@@ -4361,14 +4511,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "이미 동작하고 있는 데비안 시스템이 있다면, 설치 리포트를 보내는 가장 쉬운 방"
 "법은 <classname>installation-report</classname> 및 <classname>reportbug</"
diff --git a/po/ko/boot-new.po b/po/ko/boot-new.po
index cfcb432dc..109740b64 100644
--- a/po/ko/boot-new.po
+++ b/po/ko/boot-new.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-new.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-12-24 22:05+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -20,8 +20,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "새로운 데비안 시스템으로 부팅하기"
 
 #. Tag: title
@@ -54,8 +55,8 @@ 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -67,11 +68,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -98,11 +106,11 @@ msgstr ""
 #| "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 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 "
+"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 "
@@ -570,11 +578,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/ko/hardware.po b/po/ko/hardware.po
index 2d6daacbe..100062b6e 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -35,7 +35,7 @@ msgstr "시스템 요구 사항"
 #| "about hardware supported by GNU and Linux."
 msgid ""
 "This section contains information about what hardware you need to get "
-"started with Debian. You will also find links to further information about "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "여기에서 데비안을 처음 설치하려면 어떤 하드웨어가 필요한지 설명합니다. 또 "
@@ -60,13 +60,13 @@ msgstr "지원하는 하드웨어"
 #| "for more details on &arch-title; architecture systems which have been "
 #| "tested with Debian."
 msgid ""
-"Debian does not impose hardware requirements beyond the requirements of the "
-"Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "리눅스 커널과 GNU 툴셋을 쓰는 데 필요한 것 외에는 데비안에 특별히 필요한 하드"
 "웨어는 따로 없습니다. 그러므로 리눅스 커널, libc, <command>gcc</command> 등"
@@ -95,9 +95,12 @@ msgstr "지원하는 아키텍처"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
 msgstr ""
 "데비안 GNU/Linux &release; 버전은 17개의 주요 아키텍처를 지원하고 각 아키텍처"
@@ -111,8 +114,9 @@ msgstr "아키텍처"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "데비안 명칭"
 
 #. Tag: entry
@@ -460,7 +464,7 @@ msgstr "tape"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -486,9 +490,9 @@ msgstr ""
 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."
+"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> 아키텍처에서의 설치를 다루고 있습"
 "니다. 데비안이 지원하는 다른 아키텍처에 관한 정보를 보려면 <ulink url="
@@ -568,11 +572,16 @@ msgstr "AMD64 및 인텔 EM64T 프로세서를 지원합니다."
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 아키텍처는 각 아키텍처마다 전용 커널이 필요합니다. 따라서 표준 데비안 배"
@@ -581,10 +590,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "ARM CPU 대부분은 어느 엔디안 모드든 (빅 엔디안과 리틀 엔디안) 둘 중 하나로 선"
@@ -605,14 +618,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "인텔의 I/O 프로세서 (IOP) 제품군은 데이터 저장 및 처리와 관련된 제품에 들어 "
 "있습니다. 데비안은 현재 IOP32x 플랫폼을 지원합니다. IOP 80219 및 32x 칩이 이 "
@@ -709,10 +730,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 "Versatile 플랫폼은 QEMU가 에뮬레이션할 수 있습니다. 그래서 ARM 하드웨어가 없"
 "이도 ARM용 데비안을 테스트할 수 있는 좋은 방법입니다."
@@ -749,24 +773,43 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:417
-#, no-c-format
+#, fuzzy, 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\", 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>."
+"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>."
 msgstr ""
 "하지만 데비안 GNU/리눅스 &releasename; 배포판은 386이나 그 이전의 프로세서에"
 "서 동작하지 않습니다. 아키텍처 이름이 \"i386\"이긴 하지만, 데비안 사지"
@@ -818,22 +861,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
+#, fuzzy, 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> "
+"&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> </"
+"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>."
+"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>."
 msgstr ""
 "&arch-title; 데비안은 다음 플랫폼을 지원합니다. <itemizedlist> "
 "<listitem><para> SGI IP22: 이 플랫폼은 SGI 컴퓨터인 Indy, Indigo 2, "
@@ -851,10 +909,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -875,17 +938,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
+#, fuzzy, 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> "
+"&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 "
+"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 "
+"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>."
@@ -947,9 +1023,12 @@ msgstr "커널 기종"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr "데비안의 powerpc 커널은 CPU 종류에 따라서 두 가지의 기종이 있습니다:"
 
@@ -1023,12 +1102,17 @@ msgstr "파워 매킨토시 (pmac) 서브 아키텍처"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "애플은 (그리고 다른 몇 개 제조업체, 예를 들어 파워 컴퓨팅은) PowerPC 프로세"
 "서 기반의 매킨토시 컴퓨터를 만들었습니다. 각 아키텍처 지원을 위해 NuBus (데비"
@@ -1453,18 +1537,29 @@ msgstr "Nubus 파워맥 서브 아키텍처 (지원하지 않음)"
 
 #. Tag: para
 #: hardware.xml:952
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "NuBus 시스템은 데비안/powerpc가 현재 지원하지 않습니다. 모노리딕 리눅스/PPC "
 "커널은 이 컴퓨터를 지원하지 않습니다. 모노리딕 커널 대신에 MkLinux 마크 "
@@ -1596,11 +1691,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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를 지원했던 데비안 릴리스는 etch였고, 그것도 sun4m 시스템만 지"
 "원합니다. 기타 32비트 서브아키텍처 지원은 그 전부터 중단된 상태였습니다."
@@ -1687,11 +1786,18 @@ msgstr "다중 프로세서"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1714,11 +1820,11 @@ msgstr ""
 #| "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 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>"
+"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 ""
 "CPU가 1개인 시스템에서 커널을 최적화하려면, 표준 데비안 커널을 바꿔야 합니"
 "다. <phrase arch=\"linux-any\">어떻게 하는지에 대한 이야기는 <xref linkend="
@@ -1728,11 +1834,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1745,23 +1858,33 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
+"not compiled with SMP support."
 msgstr ""
 "&arch-title; 아키텍처용 데비안 커널 이미지 패키지의 486 버전에는 SMP 기능이 "
 "들어 있지 않습니다."
 
 #. Tag: para
 #: hardware.xml:1172
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "이 아키텍처는 다중 프로세서(<quote>symmetric multi-processing</quote> 혹은 "
 "SMP라고도 합니다)를 지원합니다. 하지만 표준 데비안 &release;의 커널 이미지는 "
@@ -1781,7 +1904,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1795,14 +1918,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "이 아키텍처는 다중 프로세서(<quote>symmetric multi-processing</quote> 혹은 "
 "SMP라고도 합니다)를 지원하고, 미리 컴파일한 데비안 커널 이미지에서 지원합니"
@@ -1867,13 +1998,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, 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;."
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"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 비디오 카드를 X.Org에서 지원합"
@@ -2141,14 +2278,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, no-c-format
+#, fuzzy, 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 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>"
+"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 ""
 "어떤 경우는 필요한 드라이버가 데비안 패키지로 없을 수도 있습니다. 그러면 인터"
 "넷에서 소스 코드가 있는 지 찾아보고 직접 드라이버를 컴파일하십시오. 컴파일하"
@@ -2425,9 +2569,15 @@ msgstr "GNU/리눅스 용도의 하드웨어 구입하기"
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2635,14 +2785,21 @@ msgstr "설치 미디어"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "여기서는 여러 가지 종류의 미디어 중에서 어떤 미디어로 데비안을 설치해야 할 "
 "지 다룹니다. 예를 들어 플로피 디스크 드라이브가 있다면, 그 드라이브로 데비안"
@@ -2795,10 +2952,17 @@ msgstr "USB 메모리"
 
 #. Tag: para
 #: hardware.xml:1767
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2885,14 +3049,22 @@ msgstr "지원하는 저장 장치"
 
 #. Tag: para
 #: hardware.xml:1821
-#, no-c-format
+#, fuzzy, 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, which "
-"includes many drivers that won't be used for your machine<phrase arch="
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "데비안 부팅 디스크에는 가능한 한 여러가지 시스템에서 동작할 수 있도록 빌드한 "
@@ -2903,11 +3075,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "보통 데비안 설치 시스템은 플로피, IDE 드라이브 (PATA), IDE 플로피, 패러렐 포"
diff --git a/po/ko/install-methods.po b/po/ko/install-methods.po
index c07aea7eb..f4aece94b 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -33,14 +33,28 @@ msgstr "공식 &debian-gnu; CD-ROM 세트"
 
 #. 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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -63,7 +77,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -72,7 +98,7 @@ msgid ""
 "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 "
+"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."
@@ -117,25 +143,33 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, no-c-format
+#| msgid "Downloading Files from Debian Mirrors"
+msgid "Downloading Files from &debian; Mirrors"
 msgstr "데비안 미러에서 파일 다운로드"
 
 #. Tag: para
 #: install-methods.xml:85
-#, no-c-format
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "가장 가까이 있는 (그래서 가장 빠를 것 같은) 미러 사이트를 찾으려면, <ulink "
 "url=\"&url-debian-mirrors;\">데비안 미러 목록</ulink>을 참고하십시오."
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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를 통해 파일을 다운로드할 때, 파일을 <emphasis>바이너리"
@@ -150,9 +184,15 @@ msgstr "설치 이미지를 찾을 위치"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -212,10 +252,14 @@ msgstr "GLAN Tank 설치 파일"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "GLAN Tank는 데비안을 설치하려는 디스크의 ext2 파티션에 커널과 램디스크가 있어"
@@ -229,10 +273,14 @@ msgstr "Kurobox Pro 설치 파일"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "Kurobox Pro는 데비안을 설치하려는 디스크의 ext2 파티션에 커널과 램디스크가 있"
@@ -379,12 +427,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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 ""
 "플로피를 만들기 전에, 먼저 데비안 미러에서 <xref linkend=\"downloading-files"
 "\"/>에 설명한 방법대로 파일을 다운로드합니다. <phrase arch=\"i386\">설치 CD-"
@@ -532,10 +587,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "이 도구는 공식 데비안 CD-ROM의 <filename>/tools</filename> 디렉터리 아래에 있"
 "습니다."
@@ -548,10 +606,19 @@ msgstr "맥오에스에서 디스크 이미지 쓰기"
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -589,12 +656,17 @@ msgstr "<command>Disk Copy</command>로 디스크 이미지 쓰기"
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "공식 &debian-gnu; CD에 있는 파일에서 플로피 이미지를 만들면, Type과 Creator"
 "가 이미 지정되어 있습니다. 다음의 <command>Creator-Changer</command> 단계는 "
@@ -960,14 +1032,23 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -1039,7 +1120,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "대부분의 USB 장치는 한 개의 FAT16 파티션으로 미리 포맷되어 있기 때문에, 다시 "
 "파티션 하거나 다시 포맷할 필요가 없습니다. 해야 한다면 <command>cfdisk</"
@@ -1172,7 +1253,7 @@ msgstr ""
 #| "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 "
+"&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> "
@@ -1186,7 +1267,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1199,7 +1293,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "USB 메모리 대부분은 처음에는 Open Firmware가 부팅할 수 없는 방식으로 되어 있"
 "습니다. 그래서 USB 메모리를 다시 파티션해야 합니다. 맥 시스템에서는 "
@@ -1334,12 +1428,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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> 이미지를 사용하는 경우, 데비안 ISO 이미지를 "
 "USB 메모리에 복사해야 합니다. (비지니스 카드, 네트워크 설치, 전체 CD 이미지 "
@@ -1475,7 +1574,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1538,7 +1637,8 @@ 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:\\</filename>."
+"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"filename>."
 msgstr ""
 "데비안 아카이브의 다음 파일을 하드 드라이브의 편리한 위치로 복사하십시오. 예"
 "를 들어 <filename>/boot/newinstall/</filename>같은 위치로 복사하십시오."
@@ -1566,14 +1666,24 @@ msgstr "올드월드 맥에서 하드 디스크 설치 프로그램 부팅"
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1590,12 +1700,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1643,10 +1765,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1769,10 +1896,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "일부 오래된 HPPA 컴퓨터의 경우 (예를 들어 715/75) BOOTP를 쓰지 마시고 RBOOTD"
 "를 사용하십시오. 데비안에는 <classname>rbootd</classname> 패키지가 들어 있습"
@@ -2049,13 +2179,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2179,8 +2340,8 @@ msgstr ""
 #: 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 "
+"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."
@@ -2188,10 +2349,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2390,8 +2564,8 @@ msgstr "자동 설치"
 #| "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 "
+"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 ""
@@ -2403,15 +2577,21 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Automatic Installation Using the Debian Installer"
+msgid "Automatic Installation Using the &debian; Installer"
 msgstr "데비안 설치 프로그램을 이용한 자동 설치"
 
 #. Tag: para
 #: install-methods.xml:1604
-#, no-c-format
+#, fuzzy, 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 "
+"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."
diff --git a/po/ko/installation-howto.po b/po/ko/installation-howto.po
index b9c545184..443ba3953 100644
--- a/po/ko/installation-howto.po
+++ b/po/ko/installation-howto.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-howto.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-10-12 20:19+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -89,12 +89,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "설치 방법에 따라 CD 이미지 외에 다른 이미지 파일이 필요하기도 합니다. "
 "<phrase condition=\"unofficial-build\"> <ulink url=\"&url-d-i;\">&d-i; 홈페이"
@@ -163,11 +168,15 @@ msgstr "플로피"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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로 부팅할 수 없으면, 플로피 이미지를 받아서 플로피로 데비안을 설치할 수 있"
 "습니다. 필요한 이미지는 <filename>floppy/boot.img</filename>, "
@@ -238,10 +247,14 @@ msgstr "USB 메모리"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "이동식 USB 저장 장치로 설치할 수도 있습니다. 예를 들어 USB 열쇠고리를 어디든 "
@@ -249,14 +262,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -347,12 +369,21 @@ msgstr "하드 디스크 부팅"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -459,12 +490,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "유지하려는 DOS나 윈도우즈 파티션이 있다면, 자동 파티션을 할 때 주의 하십시"
@@ -622,10 +659,13 @@ msgstr "그리고 마지막으로&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"We hope that your &debian; installation is pleasant and that you find "
+"&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
 msgstr ""
 "즐겁게 데비안을 설치하고 데비안의 좋은 점을 느끼셨기 바랍니다. 이제 <xref "
 "linkend=\"post-install\"/> 부분을 읽어 보십시오."
diff --git a/po/ko/partitioning.po b/po/ko/partitioning.po
index 659197a9a..af3de91fd 100644
--- a/po/ko/partitioning.po
+++ b/po/ko/partitioning.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partitioning.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-12-26 20:20+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -20,14 +20,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, no-c-format
+#| msgid "Partitioning for Debian"
+msgid "Partitioning for &debian;"
 msgstr "데비안에서 파티션하기"
 
 #. Tag: title
 #: partitioning.xml:13
-#, no-c-format
-msgid "Deciding on Debian Partitions and Sizes"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "데비안 파티션 및 크기 정하기"
 
 #. Tag: para
@@ -143,14 +145,21 @@ msgstr "디렉토리 구조"
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "&debian-gnu;는 디렉토리와 파일의 이름을 정할 때 <ulink url=\"&url-fhs-home;"
 "\">Filesystem Hierarchy Standard</ulink>를 따릅니다. 이 표준을 준수하면 사용"
@@ -424,15 +433,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -492,9 +514,16 @@ msgstr "권장하는 파티션 구조"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -524,17 +553,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "데비안에 없는 프로그램을 많이 설치하려면 <filename>/usr/local</filename>을 별"
 "도의 파티션에 두는 것이 좋을 수도 있습니다. 메일 서버일 경우에는 <filename>/"
@@ -816,15 +855,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, no-c-format
+#| msgid "Debian Partitioning Programs"
+msgid "&debian; Partitioning Programs"
 msgstr "데비안의 파티션 프로그램"
 
 #. Tag: para
 #: partitioning.xml:436
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -841,9 +886,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -1044,14 +1094,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "DOS나 윈도우즈같은 기존 운영 체제가 있고, 그 운영체제를 유지하면서 데비안을 "
@@ -1150,7 +1208,7 @@ 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 "
+"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 "
diff --git a/po/ko/post-install.po b/po/ko/post-install.po
index b0b86b2af..db0cf29df 100644
--- a/po/ko/post-install.po
+++ b/po/ko/post-install.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: post-install.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-01-06 14:39+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -102,7 +102,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -110,7 +119,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "리눅스는 유닉스를 구현한 것입니다. <ulink url=\"&url-ldp;\">Linux "
@@ -123,19 +132,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "데비안에 익숙해지기"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "데비안은 다른 배포판과 약간 다릅니다. 다른 배포판에 익숙해져 있다고 해도, 몇 "
@@ -145,15 +162,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "데비안 패키지 시스템"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -288,13 +321,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"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>에도 좋은 문서가 많이 들어 있습니다. 특히 "
@@ -306,19 +347,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "<ulink url=\"http://www.debian.org/\">데비안 홈페이지</ulink>에는 많은 양의 "
 "데비안 관련 문서가 있습니다. 특히 <ulink url=\"http://www.debian.org/doc/FAQ/"
@@ -352,12 +407,17 @@ msgstr "시스템에 전자메일 준비하기"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "전자메일은 오늘날 많은 사람들의 삶에 중요한 위치를 차지하고 있습니다. 전자메"
 "일을 준비하는 방법은 여러가지가 있고 제대로 설정해야만 동작하는 데비안 응용프"
@@ -411,17 +471,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "그래픽 데스크탑에 대한 인기가 늘어나면서, 그놈 <command>에볼루션</command>이"
@@ -513,10 +584,14 @@ msgstr "시스템 외부에 전자메일 보내기"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "앞에서 말한 것처럼 데비안 시스템을 설치하면 시스템 내부의 전자메일만 처리하도"
@@ -553,13 +628,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "외부 메일 서버를 사용하는 경우에도 각각의 유틸리티마다 올바르게 전자메일을 보"
 "내도록 설정해야 할 수 있습니다. 그러한 유틸리티의 하나가 <command>reportbug</"
@@ -779,11 +860,18 @@ msgstr "새 커널 컴파일하기"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -851,9 +939,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -881,10 +975,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -933,7 +1034,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -945,7 +1059,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "그리고 커널을 설정합니다. X11을 설치했고 X11이 돌아가는 중이라면 "
@@ -1033,9 +1147,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/ko/preface.po b/po/ko/preface.po
index 11b7e5449..f189b2e95 100644
--- a/po/ko/preface.po
+++ b/po/ko/preface.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preface.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-07-17 02:56+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -27,13 +27,19 @@ msgstr "&architecture;용 &debian-gnu; &release; 설치하기"
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "여러분이 데비안을 사용하게 되어 매우 기쁩니다. 데비안의 GNU/리눅스 배포판이 "
 "다른 데 비길 데 없는 배포판이라고 아시게 될 거라고 확신합니다. &debian-gnu;"
@@ -43,10 +49,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/ko/preparing.po b/po/ko/preparing.po
index 77ed316d5..c0f15ff7e 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -28,9 +28,13 @@ msgstr "&debian-gnu;를 설치하기 전에"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -46,11 +50,15 @@ msgstr "설치 과정 개요"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "먼저 시스템을 다시 설치하는 일에 대해 설명합니다. 데비안에서는 시스템을 처음"
 "부터 다시 설치해야 할 상황은 아주 드뭅니다. 다시 설치해야 하는 경우는 아마도 "
@@ -72,15 +80,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -121,25 +140,32 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, no-c-format
+#| msgid "Create partitionable space for Debian on your hard disk."
+msgid "Create partitionable space for &debian; on your hard disk."
 msgstr "하드 디스크에 데비안에 사용할 파티션 가능한 공간을 만드십시오."
 
 #. Tag: para
 #: preparing.xml:73
-#, no-c-format
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "해당 컴퓨터에 필요한 설치 프로그램 소프트웨어 및 필요한 드라이버 파일을 찾아"
 "서 다운로드하십시오. (데비안 CD 사용자 제외.)"
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "부팅 테이프/플로피/USB 메모리를 만드십시오. 혹은 부팅 파일을 저장해 놓으십시"
@@ -183,8 +209,9 @@ msgstr "1개 이상의 DASD(Direct Access Storage Device)를 부착하십시오.
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 "데비안을 설치할 파티션을 만들고 마운트하십시오."
 
 #. Tag: para
@@ -386,10 +413,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -399,10 +431,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "지금 읽고 있는 이 문서는 데비안의 다음  릴리스를 위한 설치 안내서의 개발 버전"
@@ -480,10 +516,14 @@ msgstr "&arch-title;용 리눅스"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "메인프레임용 리눅스 배포판에 대해 설명하는 IBM 레드북입니다. 레드북에는 데비"
@@ -1076,11 +1116,19 @@ msgstr "5기가바이트"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1134,12 +1182,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1202,11 +1260,11 @@ 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 "
+"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."
+"very least you will need a dedicated partition for the &debian; root."
 msgstr ""
 "시스템에 이미 다른 운영 체제가 들어 있고 <phrase arch=\"x86\"> (윈도우즈 9x, "
 "윈도우즈 NT/2000/XP, OS/2, 맥오에스, Solaris, FreeBSD, &hellip;) </phrase> "
@@ -1264,10 +1322,15 @@ msgstr "FIXME: write about HP-UX disks?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1305,11 +1368,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1321,10 +1391,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "컴퓨터에 DOS나 윈도우즈에서 사용하는 FAT나 NTFS 파일 시스템이 있으면, 데비안 "
@@ -1333,11 +1407,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1363,8 +1446,9 @@ msgstr ""
 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."
+"&debian; installation. Windows and other OS installations may destroy your "
+"ability to start &debian;, or encourage you to reformat non-native "
+"partitions."
 msgstr ""
 "같은 컴퓨터에 여러 개의 운영 체제를 설치하려는 경우, 리눅스를 설치하기 전에 "
 "다른 운영 체제를 먼저 설치해야 합니다. 윈도우즈 및 다른 운영 체제를 설치하면 "
@@ -1401,8 +1485,8 @@ msgid ""
 "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."
+"can delete the placeholder with the &debian; partition tools later during "
+"the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 "OpenFirmware에서 &debian-gnu;를 자동으로 부팅하도록 하려면, 리눅스 파티션이 "
 "해당 디스크의 다른 파티션보다, 특히 맥오에스 부팅 파티션보다 앞에 있어야 합니"
@@ -1413,11 +1497,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "파티션이 1개인 하드 디스크가 1개 있고 (일반적인 데스크탑 컴퓨터), 원래 운영 "
 "체제와 데비안을 멀티 부팅하는 경우, 다음과 같이 해야 합니다:"
@@ -1461,18 +1549,22 @@ msgstr "새 파티션에 원래 운영 체제를 설치하십시오."
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "원래 운영 체제로 돌아가서 제대로 되었는지 확인하고, 데비안 설치 프로그램의 부"
 "팅 파일을 다운로드하십시오."
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, 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
@@ -1493,7 +1585,7 @@ 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "기존 FAT나 NTFS 파티션을 변경하는 경우에는, 아래의 방법을 사용하거나 윈도우즈"
 "나 DOS에 들어 있는 도구를 이용하십시오. 그 외의 경우에는 DOS나 윈도우즈에서 "
@@ -1501,13 +1593,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1526,11 +1626,22 @@ msgstr "DOS, Win-32, OS/2의 데이터 손실없이 다시 파티션하기"
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1549,14 +1660,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 ""
 "계속 진행하기 전에 디스크를 어떻게 나눌 지 결정해야 합니다. 여기에 쓰여 있는 "
 "방법은 파티션을 두 개로 나누는 것 뿐입니다. 한 파티션에는 원래 OS가 들어 있"
@@ -1583,17 +1701,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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 ""
 "먼저 필요한 건 데비안 미러 사이트에서 <filename>tools/</filename> 디렉토리에 "
@@ -1664,8 +1793,8 @@ msgstr "DOS용 파티션하기"
 #| "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 "
+"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 ""
@@ -1687,7 +1816,7 @@ 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:"
+"following command from &debian;:"
 msgstr ""
 "DOS에 사용할 파티션을 만들거나 크기를 변경하는 경우, 맨 앞의 섹터 몇 개를 0으"
 "로 채워 넣는 것이 좋습니다. DOS에서 <command>format</command> 명령어를 실행하"
@@ -1707,11 +1836,18 @@ msgstr "SunOS에서 파티션하기"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1849,10 +1985,18 @@ msgstr "설치하기 전에 할 하드웨어 및 운영 체제 설정"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1873,13 +2017,21 @@ msgstr "BIOS 설정 메뉴 들어가기"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "BIOS는 컴퓨터를 부팅시키고 운영 체제에서 하드웨어를 접근하는 기본적인 기능이 "
 "들어 있습니다. 시스템에서 BIOS 설정 메뉴가 있으면, 그 메뉴를 이용해 BIOS를 설"
@@ -2011,7 +2163,16 @@ msgstr "부팅 장치 선택"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -2019,7 +2180,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "많은 BIOS의 설정 메뉴에서는 시스템을 부팅하는 데 쓸 장치를 선택할 수 있습니"
 "다. 여기에서 <filename>A:</filename>에서 운영 체제를 부팅하도록 설정하고, 그 "
@@ -2675,17 +2836,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "실제 설치를 하기 전에, 약간의 설계와 준비 단계를 거쳐야 합니다. IBM이 작성한 "
 "문서에서 전체 과정에 대해 다룹니다. 예를 들어 설치 미디어를 준비하고 그 미디"
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index db8e18723..6aeaa9295 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -580,12 +580,26 @@ 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"
+#, fuzzy, 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 "
+"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 "
@@ -975,14 +989,22 @@ msgstr "미리 설정 파일을 지정하는 데 DHCP 서버 사용하기"
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "DHCP를 이용해 설정사항을 미리 기록한 파일을 네트워크에서 다운로드하게 만들 "
@@ -1019,13 +1041,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"automate &debian; installs should only be done with care."
 msgstr ""
 "DHCP 미리 설정을 하려면 네트워크에 해당하는 값만 미리 설정하는 게 좋습니다. "
 "예를 들어 데비안 미러 사이트를 설정하면 네트워크 안에서 설치하는 시스템에 알"
diff --git a/po/ko/random-bits.po b/po/ko/random-bits.po
index 42cdc2bf8..e455df5b6 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -839,7 +839,16 @@ msgstr "유닉스/리눅스 시스템에서 &debian-gnu; 설치하기"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -848,7 +857,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "이 부분에서는 (이 안내서의 다른 부분에 설명한) ncurses 기반 메뉴 방식 설치 프"
 "로그램을 사용하지 않고, 기존 유닉스 혹은 리눅스 시스템을 이용해 &debian-gnu; "
@@ -861,13 +870,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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 ""
 "새로 설치한 데비안 시스템을 필요에 맞게 설정하기만 하면, 기존 사용자 데이터"
 "를 (있다면) 옮겨와서 계속 사용할 수 있습니다. 즉 <quote>다운타임이 없는</"
@@ -889,7 +904,7 @@ msgstr ""
 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 "
+"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 "
@@ -944,10 +959,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -994,17 +1019,28 @@ msgstr "<command>debootstrap</command> 설치"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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 ""
 "데비안 베이스 시스템을 설치할 때 데비안 설치 프로그램이 사용하는 프로그램은, "
 "공식적으로 <command>debootstrap</command>입니다. <command>debootstrap</"
@@ -1018,14 +1054,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1062,10 +1109,16 @@ msgstr "<command>debootstrap</command> 실행"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1126,13 +1179,20 @@ msgstr "베이스 시스템 설정"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 "이렇게 하면 디스크 안에 임시 시스템이 아니라 완전한 데비안 시스템이 갖춰졌습"
 "니다. <command>chroot</command>로 그 안에 들어갑니다: "
@@ -1223,7 +1283,48 @@ msgstr "파티션 마운트하기"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1250,7 +1351,7 @@ msgid ""
 "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 "
+"</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"
@@ -1669,12 +1770,17 @@ msgstr "부트로더 설정하기"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "&debian-gnu; 시스템을 부팅 가능하게 하려면, 부트로더를 설정해서 루트 파티션에"
 "서 설치한 커널을 읽어들이도록 하십시오. <command>debootstrap</command>은 부트"
@@ -1696,8 +1802,8 @@ msgstr ""
 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 "
+"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 "
@@ -1778,11 +1884,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1876,12 +1990,19 @@ msgstr "패러렐 라인 IP를 (PLIP) 이용해 &debian-gnu; 설치하기"
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 "이 부분은 이더넷 카드는 없지만 게이트웨이 컴퓨터와 널 모뎀 케이블을 (널 프린"
 "터 케이블이라고도 합니다) 통해 연결되어 있는 컴퓨터에 &debian-gnu;를 설치하"
@@ -1935,10 +2056,13 @@ msgstr "요구 사항"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr "데비안을 설치할 <emphasis>타겟</emphasis>이라고 하는 대상 컴퓨터."
 
 #. Tag: para
@@ -2363,11 +2487,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2380,11 +2511,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/ko/using-d-i.po b/po/ko/using-d-i.po
index 985dba847..0cd5ad4cc 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -21,8 +21,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "데비안 설치 프로그램 사용하기"
 
 #. Tag: title
@@ -33,9 +34,15 @@ msgstr "설치 프로그램이 동작하는 방식"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -346,8 +353,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "데비안 설치 CD를 찾아서 마운트합니다."
 
 #. Tag: term
@@ -387,10 +395,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr ""
 "데비안 아카이브 미러 목록을 표시합니다. 설치할 패키지가 들어 있는 위치를 선택"
 "합니다."
@@ -478,12 +489,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "시스템에 달린 디스크를 파티션하고, 파티션에 파일 시스템을 만들고, 파일 시스템"
 "을 마운트 위치에 마운트합니다. 완전 자동 모드 혹은 LVM 지원 기능과 같은 재미"
@@ -684,11 +700,16 @@ msgstr "save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "문제가 발생했을 때 관련 정보를 플로피 디스크나 네트워크, 하드 디스크 등의 미"
 "디어에 기록합니다. 나중에 설치 프로그램의 소프트웨어 문제를 데비안 개발자에"
@@ -719,15 +740,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, no-c-format
+#| msgid "Setting up Debian Installer and Hardware Configuration"
+msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr "데비안 설치 프로그램 준비 및 하드웨어 설정"
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -931,7 +963,7 @@ msgstr ""
 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 "
+"&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 ""
@@ -1104,18 +1136,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, no-c-format
+#| msgid "Looking for the Debian Installer ISO Image"
+msgid "Looking for the &debian; Installer ISO Image"
 msgstr "데비안 설치 프로그램 ISO 이미지 찾기"
 
 #. Tag: para
 #: using-d-i.xml:676
-#, no-c-format
+#, fuzzy, 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."
+"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> 방법으로 설치하면, 데비안 설치 프로그램 ISO 이"
 "미지를 찾아서 마운트해야 하는 시점이 있습니다. 이 ISO 이미지에서 나머지 설치 "
@@ -1124,7 +1162,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1135,9 +1187,9 @@ msgid ""
 "<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."
+"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>."
@@ -1978,13 +2030,19 @@ msgstr "수동 파티션하기"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "수동 파티션을 선택하면 위와 비슷한 화면을 표시합니다. 다른 점은 기존 파티션 "
 "테이블을 마운트 위치 없이 표시한다는 점입니다. 이 절의 나머지 부분에서는 파티"
@@ -4049,13 +4107,19 @@ msgstr "다른 운영 체제 검색"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "부트로더를 설치하기 전에, 컴퓨터에 설치되어 있는 다른 운영 체제가 있는 지 찾"
 "아봅니다. 부트로더가 지원하는 운영 체제가 있으면 부트로더를 설치하는 단계에"
@@ -4207,17 +4271,22 @@ msgstr "이렇게 하면 <command>LILO</command>가 부팅 과정을 완전히 �
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "새 데비안 파티션"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"will install itself at the beginning of the new &debian; partition and it "
+"will serve as a secondary boot loader."
 msgstr ""
 "다른 부팅 관리자를 사용하려면 이 옵션을 선택하십시오. <command>LILO</command>"
 "는 새 데비안 파티션의 맨 앞쪽에 설치하고 보조 부트로더로 동작합니다."
@@ -4243,13 +4312,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "이 단계를 실행했을 때 윈도우즈 9x로 (아니면 DOS로) 부팅할 수 없게 된다면, 윈"
 "도우즈 9x (MS-DOS) 부팅 디스크를 이용해 <userinput>fdisk /mbr</userinput> 명"
@@ -4390,10 +4465,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4410,11 +4490,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"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."
@@ -4448,12 +4534,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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>에서 가리키"
 "는 파일을 복사한 파일입니다. 표준 데비안 설치에서 이 파일은 <filename>/boot</"
@@ -4719,9 +4810,13 @@ msgstr "설치 마치기"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4783,11 +4878,15 @@ msgstr "시스템 다시 시작"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "설치 프로그램을 부팅할 때 사용했던 부팅 미디어를 (CD, 플로피 등) 빼라는 말이 "
 "나옵니다. 그 다음에 새로 설치한 데비안 시스템으로 다시 시작합니다."
@@ -4830,11 +4929,15 @@ msgstr "설치 로그 저장"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "설치가 성공적이었으면, 설치할 때 만든 로그 파일은 새 데비안 시스템의 "
 "<filename>/var/log/installer/</filename> 파일에 자동으로 저장합니다."
diff --git a/po/ko/welcome.po b/po/ko/welcome.po
index 4c6ada1d7..ae0a5ba15 100644
--- a/po/ko/welcome.po
+++ b/po/ko/welcome.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: welcome.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-11-11 22:40+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -21,17 +21,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "데비안을 만나신 것을 환영합니다"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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-gnu;에 대해 간단히 설명합니다. 데비안 "
 "프로젝트의 역사와 &debian-gnu; 배포판에 대해 이미 알고 있다면 다음 장으로 넘"
@@ -383,18 +388,30 @@ msgstr ""
 # &debian-gnu; => 데비안 GNU/리눅스 (조사 사용 주의)
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Linux?"
+msgid "What is &debian; GNU/Linux?"
 msgstr "Debian GNU/Linux란?"
 
 # &debian-gnu; => 데비안 GNU/리눅스, 조사 구분에 주의
 #. Tag: para
 #: welcome.xml:232
-#, no-c-format
+#, fuzzy, 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 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 "
+"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 "
@@ -414,9 +431,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -427,12 +449,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "기술적으로 우수하면서 리눅스 공동체의 필요와 기대에 대해 적극적으로 참여하기 "
 "때문에, 데비안은 고급 사용자에게 특히 인기가 있습니다. 또한 데비안은 지금은 "
@@ -440,9 +467,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -453,9 +485,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -466,11 +503,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -485,15 +531,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "여러분의 시스템을 <quote>트로이 목마</quote> 및 기타 악의적인 소프트웨어로부"
 "터 보호하기 위해, 각 패키지마다 등록된 데비안 메인테이너가 패키지를 업로드하"
@@ -505,15 +559,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "여러분의 Debian GNU/Linux 시스템에 대한 지원을 받고 데비안 개발자와 연락을 "
 "할 수 있는 많이 사용하는 방법이면서 가장 좋은 방법은, 데비안 프로젝트에서 관"
@@ -526,28 +588,41 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "데비안 GNU/Hurd란?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"데비안 GNU/Hurd는 리눅스 모노리딕 (Monolithic) 커널을 GNU Hurd로 바꾼 데비안 "
+"GNU 시스템으로, GNU 마크 (Mach) 마이크로 커널에서 동작하는 서버의 모음입니"
+"다. Hurd는 아직까지 개발이 끝나지 않았고, 일상적인 용도로 사용하기에는 적합하"
+"지 않지만, 개발은 계속 진행 중입니다. 현재 Hurd는 i386 아키텍처용으로만 개발"
+"중이지만, 일단 시스템이 더 안정되면 다른 아키텍처로 포팅될 것입니다."
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -560,7 +635,7 @@ msgstr ""
 #| "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 "
+"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/hurd/\">데비안 "
@@ -569,16 +644,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "데비안 GNU/Hurd란?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -607,16 +683,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; 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/\">데비안 "
@@ -625,19 +705,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "데비안 구하기"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "공식 데비안 CD를 인터넷에서 다운로드할 수 있는 곳이나 구입할 수 있는 곳에 대"
 "해서는 <ulink url=\"&url-debian-distrib;\">배포판 웹 페이지</ulink>를 참고하"
@@ -647,9 +734,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -685,12 +776,17 @@ msgstr "이 문서의 구성"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "이 문서는 데비안을 처음 사용하는 분을 위한 설명서입니다. 가능하면 읽는 사람"
 "이 전문지식을 갖추지 않았다고 생각하고 이 문서를 작성했습니다. 하지만 컴퓨터"
@@ -698,12 +794,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "전문적인 사용자도 이 문서를 읽으면 여러 가지 관심있는 정보를 알 수 있습니다. "
 "예를 들면 최소 설치 크기, 데비안 설치 시스템이 지원하는 하드웨어 등과 같은 내"
@@ -736,12 +837,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "<xref linkend=\"preparing\"/>에서, 데비안을 설치하기에 앞서 여러분의 시스템"
 "을 백업하고, 필요한 계획을 세우고 하드웨어를 설정합니다. 멀티 부팅을 생각하"
@@ -771,15 +877,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "<xref linkend=\"d-i-intro\"/>에 따라 실제 설치를 진행합니다. 이 단계에서 여러"
@@ -800,11 +915,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "일단 시스템을 설치했으면, <xref linkend=\"post-install\"/> 부분을 보십시오. "
 "여기에서는 유닉스와 데비안에 대해 더 많은 정보을 볼 수 있는 다른 읽을 거리를 "
@@ -864,7 +983,18 @@ msgstr "저작권 및 소프트웨어 라이선스 정보"
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -874,7 +1004,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "대부분의 상업용 소프트웨어에는 라이선스가 따라 나오는데, 아마도 이 라이선스"
 "를 조금이라도 읽어 본 적이 있을 것입니다. 이러한 라이선스는 보통 하나의 컴퓨"
@@ -907,16 +1037,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "데비안 프로젝트는 자유소프트웨어의 기준에 맞지 않는 패키지도 (사용자의 실용"
 "적 필요때문에) 일부 배포하고 있습니다. 이 패키지는 공식 배포판에 포함되지 않"
@@ -927,7 +1066,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -936,10 +1087,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "시스템의 많은 프로그램이 사용하고 있는 라이선스는 <quote>GPL</quote>로 알려"
 "진 <emphasis>GNU</emphasis> <emphasis> General Public License</emphasis>입니"
@@ -953,13 +1104,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "데비안 프로그램에 사용한 저작권과 소프트웨어 라이선스는 GPL 외에도 여러가지"
 "가 있습니다. 패키지를 설치하면 <filename>/usr/share/doc/<replaceable>패키지이"
@@ -968,9 +1125,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/nn/bookinfo.po b/po/nn/bookinfo.po
index 01d2300e9..c39d6b709 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -24,13 +24,19 @@ msgstr "Installasjonsmanual for &debian-gnu;"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Dette dokumentet inneheld installsjonsinstruksjonar for &debian-gnu; "
 "&release;-systemet (kodenamn <quote><quote></quote>), for arkitekturen &arch-"
@@ -40,17 +46,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/nn/preface.po b/po/nn/preface.po
index f63990423..adc46a9a9 100644
--- a/po/nn/preface.po
+++ b/po/nn/preface.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preface\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-05-04 21:19+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -24,13 +24,19 @@ msgstr "Installasjon av &debian-gnu; &release; for &architecture;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Vi er glade for at du har valt å prøve Debian og vi er sikre på at du kjem "
 "til å synes at Debian sin GNU/&arch-kernel; distribusjon er unik. &debian-"
@@ -40,10 +46,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/pot/administrivia.pot b/po/pot/administrivia.pot
index 962dda997..5e7309da1 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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 d190b106e..42fa1ff25 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -23,13 +23,13 @@ msgstr ""
 #. 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 ""
 
 #. 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/boot-installer.pot b/po/pot/boot-installer.pot
index 9424d06a7..8cce9bab1 100644
--- a/po/pot/boot-installer.pot
+++ b/po/pot/boot-installer.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -71,7 +71,7 @@ msgstr ""
 #. Tag: para
 #: 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 ""
 
 #. Tag: para
@@ -83,7 +83,7 @@ msgstr ""
 #. Tag: para
 #: 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 ""
 
 #. Tag: para
@@ -144,7 +144,7 @@ msgstr ""
 #: 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"
+      "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."
 msgstr ""
@@ -176,7 +176,7 @@ 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 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:"
 msgstr ""
 
 #. Tag: screen
@@ -519,7 +519,7 @@ msgstr ""
 #: 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"
+      "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"
@@ -585,7 +585,7 @@ 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 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."
 msgstr ""
 
 #. Tag: para
@@ -597,7 +597,7 @@ 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 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 ""
 
 #. Tag: para
@@ -663,7 +663,7 @@ 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 ""
 
 #. Tag: title
@@ -675,7 +675,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: para
@@ -711,7 +711,7 @@ 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 ""
 
 #. Tag: title
@@ -783,7 +783,7 @@ 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 ""
 
 #. Tag: para
@@ -862,7 +862,7 @@ 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 ""
 
 #. Tag: title
@@ -877,7 +877,7 @@ msgstr ""
 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"
+      "</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."
 msgstr ""
@@ -978,7 +978,7 @@ 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 ""
 
 #. Tag: para
@@ -1037,7 +1037,7 @@ msgid ""
       "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."
+      "</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."
 msgstr ""
 
 #. Tag: title
@@ -1290,7 +1290,7 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:2082
 #, no-c-format
-msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr ""
 
 #. Tag: para
@@ -1410,7 +1410,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: para
@@ -1518,7 +1518,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: term
@@ -1728,7 +1728,7 @@ msgstr ""
 #. 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 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."
 msgstr ""
 
 #. Tag: term
@@ -1987,7 +1987,7 @@ 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 ""
 
 #. Tag: para
@@ -2213,7 +2213,7 @@ 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</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>."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pot/boot-new.pot b/po/pot/boot-new.pot
index b29673b18..bdd6eb090 100644
--- a/po/pot/boot-new.pot
+++ b/po/pot/boot-new.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -17,7 +17,7 @@ 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 ""
 
 #. Tag: title
@@ -35,19 +35,19 @@ 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><phrase arch=\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. 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=\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. 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."
 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 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\"/>)."
 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 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."
 msgstr ""
 
 #. Tag: para
@@ -265,7 +265,7 @@ 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 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>."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pot/hardware.pot b/po/pot/hardware.pot
index c40c7e5b1..1ead18a4f 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -23,7 +23,7 @@ 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 ""
 
 #. Tag: title
@@ -35,7 +35,7 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:21
 #, no-c-format
-msgid "Debian does not impose hardware requirements beyond the requirements of the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any architecture or platform to which the Linux or kFreeBSD 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 architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 
 #. Tag: para
@@ -53,7 +53,7 @@ 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 ""
 
 #. Tag: entry
@@ -65,7 +65,7 @@ msgstr ""
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
 #, no-c-format
-msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr ""
 
 #. Tag: entry
@@ -413,7 +413,7 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -431,7 +431,7 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:196
 #, no-c-format
-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."
+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 ""
 
 #. Tag: para
@@ -473,13 +473,13 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
 #. Tag: para
@@ -497,7 +497,7 @@ msgstr ""
 #. 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 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>."
 msgstr ""
 
 #. Tag: term
@@ -545,7 +545,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: para
@@ -563,7 +563,7 @@ 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\", 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>."
 msgstr ""
 
 #. Tag: para
@@ -587,13 +587,13 @@ msgstr ""
 #. 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, 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>."
 msgstr ""
 
 #. 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 ""
 
 #. Tag: para
@@ -605,7 +605,7 @@ 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 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>."
 msgstr ""
 
 #. Tag: title
@@ -647,7 +647,7 @@ 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:"
 msgstr ""
 
 #. Tag: term
@@ -701,7 +701,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: para
@@ -1091,7 +1091,7 @@ msgstr ""
 #. 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 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>."
 msgstr ""
 
 #. Tag: title
@@ -1157,7 +1157,7 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1068
 #, 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 ""
 
 #. Tag: term
@@ -1211,43 +1211,43 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1129
 #, 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 &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
 #, 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 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
 #, 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 &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
 #, 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 ""
 
 #. Tag: para
 #: hardware.xml:1172
 #, 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 ""
 
 #. Tag: para
 #: hardware.xml:1181
 #, 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 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
 #, 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 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
@@ -1277,7 +1277,7 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1231
 #, 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 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;."
 msgstr ""
 
 #. Tag: para
@@ -1415,7 +1415,7 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1391
 #, 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 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
@@ -1559,7 +1559,7 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1572
 #, 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 ""
 
 #. Tag: para
@@ -1625,7 +1625,7 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1674
 #, 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 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
@@ -1715,7 +1715,7 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1767
 #, 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 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
@@ -1763,13 +1763,13 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1821
 #, 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, 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
 #, 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 ""
 
 #. Tag: para
diff --git a/po/pot/install-methods.pot b/po/pot/install-methods.pot
index 6f6c15669..f5a43a005 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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,13 +29,13 @@ msgstr ""
 #. 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-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."
 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-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."
 msgstr ""
 
 #. Tag: para
@@ -53,19 +53,19 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:83
 #, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+msgid "Downloading Files from &debian; Mirrors"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. Tag: title
@@ -77,7 +77,7 @@ 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 ""
 
 #. Tag: title
@@ -113,7 +113,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: title
@@ -125,7 +125,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: title
@@ -209,7 +209,7 @@ 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 ""
 
 #. Tag: para
@@ -272,7 +272,7 @@ 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 ""
 
 #. Tag: title
@@ -284,7 +284,7 @@ msgstr ""
 #. 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 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."
 msgstr ""
 
 #. Tag: para
@@ -302,7 +302,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: para
@@ -479,7 +479,7 @@ msgstr ""
 #. 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>),</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."
 msgstr ""
 
 #. Tag: title
@@ -512,7 +512,7 @@ msgstr ""
 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."
+      "</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."
 msgstr ""
 
 #. Tag: para
@@ -555,7 +555,7 @@ msgstr ""
 #. 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 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>)."
 msgstr ""
 
 #. Tag: para
@@ -564,7 +564,7 @@ msgstr ""
 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."
+      "</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."
 msgstr ""
 
 #. Tag: para
@@ -637,7 +637,7 @@ 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 ""
 
 #. Tag: title
@@ -709,7 +709,7 @@ 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 (note that LILO can not boot from files on an NTFS file system), 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 ""
 
 #. Tag: para
@@ -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 files from a &debian; CD image to <filename>c:\\</filename>."
 msgstr ""
 
 #. Tag: para
@@ -769,13 +769,13 @@ 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</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."
 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 <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."
 msgstr ""
 
 #. Tag: title
@@ -793,7 +793,7 @@ 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 ""
 
 #. Tag: filename
@@ -865,7 +865,7 @@ 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 ""
 
 #. Tag: para
@@ -1004,7 +1004,7 @@ msgstr ""
 #: 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"
+      "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"
@@ -1050,14 +1050,14 @@ 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 ""
 
 #. 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"
+      "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"
@@ -1148,19 +1148,19 @@ 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-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."
+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 ""
 
 #. Tag: title
 #: install-methods.xml:1603
 #, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+msgid "Automatic Installation Using the &debian; Installer"
 msgstr ""
 
 #. 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 ""
 
 #. Tag: para
diff --git a/po/pot/installation-howto.pot b/po/pot/installation-howto.pot
index 8237d0e19..79570d94a 100644
--- a/po/pot/installation-howto.pot
+++ b/po/pot/installation-howto.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -53,7 +53,7 @@ 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 ""
 
 #. Tag: para
@@ -89,7 +89,7 @@ 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 ""
 
 #. Tag: para
@@ -125,13 +125,13 @@ msgstr ""
 #. 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 ""
 
 #. 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 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>."
 msgstr ""
 
 #. Tag: para
@@ -179,7 +179,7 @@ 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 <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>"
 msgstr ""
 
 #. Tag: title
@@ -233,7 +233,7 @@ 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 ""
 
 #. Tag: para
@@ -305,6 +305,6 @@ msgstr ""
 #. 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 ""
 
diff --git a/po/pot/partitioning.pot b/po/pot/partitioning.pot
index 4111fd83c..14afa179f 100644
--- a/po/pot/partitioning.pot
+++ b/po/pot/partitioning.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -17,13 +17,13 @@ msgstr ""
 #. Tag: title
 #: partitioning.xml:5
 #, no-c-format
-msgid "Partitioning for Debian"
+msgid "Partitioning for &debian;"
 msgstr ""
 
 #. Tag: title
 #: partitioning.xml:13
 #, no-c-format
-msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr ""
 
 #. Tag: para
@@ -59,7 +59,7 @@ 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 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:"
 msgstr ""
 
 #. Tag: entry
@@ -299,7 +299,7 @@ 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 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."
 msgstr ""
 
 #. Tag: para
@@ -323,7 +323,7 @@ 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 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."
 msgstr ""
 
 #. Tag: para
@@ -335,7 +335,7 @@ 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; 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."
 msgstr ""
 
 #. Tag: para
@@ -479,13 +479,13 @@ msgstr ""
 #. Tag: title
 #: partitioning.xml:435
 #, no-c-format
-msgid "Debian Partitioning Programs"
+msgid "&debian; Partitioning Programs"
 msgstr ""
 
 #. 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 ""
 
 #. Tag: command
@@ -497,7 +497,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: command
@@ -629,7 +629,7 @@ 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 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."
 msgstr ""
 
 #. Tag: para
@@ -659,7 +659,7 @@ 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 <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."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pot/post-install.pot b/po/pot/post-install.pot
index bde5e6ca8..0f86f489f 100644
--- a/po/pot/post-install.pot
+++ b/po/pot/post-install.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -53,31 +53,31 @@ 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 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."
 msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
 #, no-c-format
-msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr ""
 
 #. 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 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."
 msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
 #, no-c-format
-msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr ""
 
 #. 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 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>."
 msgstr ""
 
 #. Tag: para
@@ -137,13 +137,13 @@ 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 <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>."
 msgstr ""
 
 #. 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 <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;."
 msgstr ""
 
 #. Tag: para
@@ -161,7 +161,7 @@ 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 important for some &debian; utilities, we will try to cover the basics in this section."
 msgstr ""
 
 #. Tag: para
@@ -185,7 +185,7 @@ 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 <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."
 msgstr ""
 
 #. Tag: title
@@ -221,7 +221,7 @@ 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 ""
 
 #. Tag: para
@@ -239,7 +239,7 @@ 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 ""
 
 #. Tag: para
@@ -365,7 +365,7 @@ 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. 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:"
 msgstr ""
 
 #. Tag: para
@@ -419,7 +419,7 @@ 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 ""
 
 #. Tag: para
@@ -431,7 +431,7 @@ 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 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."
 msgstr ""
 
 #. Tag: para
@@ -449,7 +449,7 @@ 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 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."
 msgstr ""
 
 #. Tag: para
@@ -479,7 +479,7 @@ 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 ""
 
 #. Tag: title
diff --git a/po/pot/preface.pot b/po/pot/preface.pot
index 7b80e7970..627cf3f43 100644
--- a/po/pot/preface.pot
+++ b/po/pot/preface.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -23,13 +23,13 @@ msgstr ""
 #. 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 ""
 
 #. 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 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\"/>."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pot/preparing.pot b/po/pot/preparing.pot
index beb94e753..b7e5cb4e4 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -23,7 +23,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: title
@@ -35,7 +35,7 @@ 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 ""
 
 #. Tag: para
@@ -47,7 +47,7 @@ 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 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."
 msgstr ""
 
 #. Tag: para
@@ -71,19 +71,19 @@ 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. Tag: para
@@ -125,7 +125,7 @@ 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 ""
 
 #. Tag: para
@@ -233,13 +233,13 @@ msgstr ""
 #. 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 ""
 
 #. 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 ""
 
 #. Tag: title
@@ -305,7 +305,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:340
 #, 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 ""
 
 #. Tag: ulink
@@ -803,7 +803,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:689
 #, 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 48MB (for i386 and 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 48MB (for i386 and 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
@@ -827,7 +827,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:721
 #, 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. 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
@@ -851,7 +851,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:759
 #, 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, 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
@@ -875,7 +875,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:799
 #, 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 ""
 
 #. Tag: para
@@ -887,25 +887,25 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:821
 #, 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 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
 #, 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 ""
 
 #. Tag: para
 #: preparing.xml:837
 #, 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 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
 #, 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 ""
 
 #. Tag: para
@@ -917,13 +917,13 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:862
 #, 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, 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
 #, 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 ""
 
 #. Tag: para
@@ -953,13 +953,13 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:908
 #, 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 ""
 
 #. Tag: para
 #: preparing.xml:914
 #, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr ""
 
 #. Tag: title
@@ -971,13 +971,13 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:929
 #, 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 ""
 
 #. Tag: para
 #: preparing.xml:937
 #, 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 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
@@ -989,13 +989,13 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:954
 #, 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), 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
 #, 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 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
@@ -1007,7 +1007,7 @@ 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."
+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 ""
 
 #. Tag: para
@@ -1037,13 +1037,13 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1023
 #, 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 ""
 
 #. Tag: para
 #: preparing.xml:1031
 #, 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 ""
 
 #. Tag: screen
@@ -1061,7 +1061,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1051
 #, 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 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
@@ -1121,7 +1121,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1141
 #, 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 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
@@ -1133,7 +1133,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1165
 #, 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 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
@@ -1223,7 +1223,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1265
 #, 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 <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
@@ -1523,7 +1523,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1668
 #, 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 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
diff --git a/po/pot/preseed.pot b/po/pot/preseed.pot
index d82ff75e4..115733f48 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -319,7 +319,7 @@ msgstr ""
 #: 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"
+      "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>."
 msgstr ""
@@ -573,7 +573,7 @@ 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 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)."
 msgstr ""
 
 #. Tag: screen
@@ -594,7 +594,7 @@ 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 ""
 
 #. Tag: title
diff --git a/po/pot/random-bits.pot b/po/pot/random-bits.pot
index 4d981152b..1964dbb53 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -703,19 +703,19 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:360
 #, 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, Mandrake, 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 rest of the manual. This <quote>cross-install</quote> HOWTO has been requested by users switching to &debian-gnu; from Red Hat, Mandrake, 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
 #, 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 ""
 
 #. Tag: para
 #: random-bits.xml:383
 #, 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 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
@@ -743,7 +743,7 @@ msgstr ""
 #: random-bits.xml:416
 #, no-c-format
 msgid ""
-      "Initialize and activate swap (substitute the partition number for your intended Debian swap partition): <informalexample><screen>\n"
+      "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"
@@ -773,7 +773,7 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:442
 #, 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 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
@@ -783,7 +783,7 @@ 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."
+      "</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."
 msgstr ""
 
 #. Tag: screen
@@ -804,7 +804,7 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:494
 #, 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 ""
 
 #. Tag: para
@@ -837,9 +837,9 @@ msgstr ""
 #: random-bits.xml:535
 #, 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"
+      "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:"
+      "</screen></informalexample> After chrooting you may need to set the terminal definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 
 #. Tag: screen
@@ -923,7 +923,7 @@ msgid ""
       "/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"
+      "</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"
@@ -1117,13 +1117,13 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:746
 #, 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 ""
 
 #. Tag: para
 #: random-bits.xml:753
 #, 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>."
+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
@@ -1166,7 +1166,7 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:787
 #, 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;, 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
@@ -1221,7 +1221,7 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:841
 #, 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 ""
 
 #. Tag: para
@@ -1251,7 +1251,7 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:875
 #, 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 ""
 
 #. Tag: para
@@ -1479,13 +1479,13 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:1150
 #, 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\"> <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
 #, 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 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
diff --git a/po/pot/using-d-i.pot b/po/pot/using-d-i.pot
index 347ca0248..8290a7842 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -17,7 +17,7 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:5
 #, no-c-format
-msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr ""
 
 #. Tag: title
@@ -29,7 +29,7 @@ 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 ""
 
 #. Tag: para
@@ -179,7 +179,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: term
@@ -215,7 +215,7 @@ msgstr ""
 #. 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."
 msgstr ""
 
 #. Tag: term
@@ -287,7 +287,7 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:264
 #, 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 ""
 
 #. Tag: term
@@ -431,7 +431,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: title
@@ -449,13 +449,13 @@ 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 ""
 
 #. 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 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)."
 msgstr ""
 
 #. Tag: para
@@ -539,7 +539,7 @@ 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 ""
 
 #. Tag: para
@@ -611,19 +611,19 @@ 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 ""
 
 #. 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 ""
 
 #. 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 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."
 msgstr ""
 
 #. Tag: para
@@ -1099,7 +1099,7 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:1219
 #, 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 ""
 
 #. Tag: para
@@ -2078,7 +2078,7 @@ 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 ""
 
 #. Tag: para
@@ -2168,13 +2168,13 @@ msgstr ""
 #. Tag: term
 #: using-d-i.xml:2704
 #, no-c-format
-msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr ""
 
 #. 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 ""
 
 #. Tag: term
@@ -2192,7 +2192,7 @@ 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 ""
 
 #. Tag: title
@@ -2258,7 +2258,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: filename
@@ -2270,7 +2270,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: filename
@@ -2294,7 +2294,7 @@ msgstr ""
 #. 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 ""
 
 #. Tag: title
@@ -2439,7 +2439,7 @@ 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 ""
 
 #. Tag: title
@@ -2475,7 +2475,7 @@ 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 ""
 
 #. Tag: para
@@ -2505,7 +2505,7 @@ 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 ""
 
 #. Tag: para
diff --git a/po/pot/welcome.pot b/po/pot/welcome.pot
index b95ec50ad..4a588ac1d 100644
--- a/po/pot/welcome.pot
+++ b/po/pot/welcome.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -17,13 +17,13 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:4
 #, no-c-format
-msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr ""
 
 #. 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 ""
 
 #. Tag: title
@@ -167,97 +167,97 @@ msgstr ""
 #. Tag: title
 #: welcome.xml:231
 #, no-c-format
-msgid "What is Debian GNU/Linux?"
+msgid "What is &debian; GNU/Linux?"
 msgstr ""
 
 #. 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 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."
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 &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."
 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 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."
 msgstr ""
 
 #. 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 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."
 msgstr ""
 
 #. Tag: title
 #: welcome.xml:315
 #, no-c-format
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid "&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
 #, no-c-format
-msgid "This port of Debian is currently only being developed for the i386 and amd64 architectures, although ports to other architectures is possible."
+msgid "This port of &debian; is currently only being developed for the i386 and amd64 architectures, although ports to other architectures is possible."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
-msgid "Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some information on Linux system may not apply to it."
+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 ""
 
 #. Tag: para
 #: welcome.xml:331
 #, no-c-format
-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."
+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 ""
 
 #. Tag: title
 #: welcome.xml:350
 #, no-c-format
-msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
-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."
+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 ""
 
 #. Tag: para
@@ -269,31 +269,31 @@ msgstr ""
 #. Tag: para
 #: welcome.xml:365
 #, no-c-format
-msgid "Please note that Debian GNU/Hurd is not a Linux system, and thus some information on Linux system may not apply to it."
+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 ""
 
 #. 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 ""
 
 #. Tag: title
 #: welcome.xml:387
 #, no-c-format
-msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. Tag: title
@@ -317,13 +317,13 @@ 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 ""
 
 #. 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 ""
 
 #. Tag: para
@@ -341,7 +341,7 @@ 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 ""
 
 #. Tag: para
@@ -359,7 +359,7 @@ 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, 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\"/>.)"
 msgstr ""
 
 #. Tag: para
@@ -371,7 +371,7 @@ 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 about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 
 #. Tag: para
@@ -407,7 +407,7 @@ 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 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>."
 msgstr ""
 
 #. Tag: para
@@ -419,25 +419,25 @@ 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 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."
 msgstr ""
 
 #. 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 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."
 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 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 ""
 
 #. 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 ""
 
 #. Tag: para
diff --git a/po/pt/administrivia.po b/po/pt/administrivia.po
index bdf92c728..e1995c6be 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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 ca1e4d931..e44145ee3 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -23,13 +23,19 @@ msgstr "Guia de Instalação de &debian-gnu;"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Este documento contém as instruções de instalação para o sistema &debian-"
 "gnu; &release;, (nome de código <quote>&releasename;</quote>), para a "
@@ -39,17 +45,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/boot-installer.po b/po/pt/boot-installer.po
index fd1633638..e54f43d17 100644
--- a/po/pt/boot-installer.po
+++ b/po/pt/boot-installer.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-installer\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-09 13:08+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -106,10 +106,16 @@ msgstr "Arrancar a partir de CD-ROM"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -141,9 +147,15 @@ msgstr ""
 #. Tag: para
 #: 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 "
+#, fuzzy, 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 "
@@ -241,10 +253,34 @@ msgstr "Através da rede utilizando Linux/Unix"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -340,12 +376,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, no-c-format
+#, fuzzy, 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 "
 "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> "
+"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:"
@@ -569,7 +613,6 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:465
 #, no-c-format
-#| msgid "Booting from MacOS"
 msgid "Booting from DOS"
 msgstr "A arrancar a partir do DOS"
 
@@ -598,9 +641,8 @@ msgstr ""
 "de CD-ROM, p.e. <informalexample><screen>\n"
 "d:\n"
 "</screen></informalexample> caso contrário assegure-se que preparou primeiro "
-"o seu disco rígido conforme é explicado em <xref linkend=\"files-loadlin\"/>"
-", e "
-"altere o leitor actual se necessário."
+"o seu disco rígido conforme é explicado em <xref linkend=\"files-loadlin\"/"
+">, e altere o leitor actual se necessário."
 
 #. Tag: para
 #: boot-installer.xml:481
@@ -621,9 +663,8 @@ msgstr ""
 "</screen></informalexample> Se preferir utilizar o instalador gráfico, "
 "introduza o directório <filename>gtk</filename>. <informalexample><screen>\n"
 "cd gtk\n"
-"</screen></informalexample> De seguida, execute <command>install.bat<"
-"/command>. "
-"O kernel irá carregar e lançar o sistema de instalação."
+"</screen></informalexample> De seguida, execute <command>install.bat</"
+"command>. O kernel irá carregar e lançar o sistema de instalação."
 
 #. Tag: title
 #: boot-installer.xml:499
@@ -984,10 +1025,24 @@ msgstr "Um Ecrã de Arranque"
 
 #. Tag: para
 #: boot-installer.xml:715
-#, no-c-format
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1166,16 +1221,27 @@ msgstr "Conteúdo do CD"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
 msgstr ""
 "Há três variações básicas dos CDs de Instalação Debian. O CD "
@@ -1216,9 +1282,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1389,10 +1462,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 "
+#, fuzzy, 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 ""
 "Estas etapas iniciam o gestor de arranque de Debian que irá mostrar uma "
@@ -1407,11 +1484,16 @@ msgstr "Opção 2: Arrancar a partir de uma Shell EFI"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "Se, por alguma razão, a opção 1 não for bem sucedida, reinicie a máquina e "
@@ -1495,9 +1577,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
-msgid ""
-"As with option 1, these steps start the Debian boot loader which will "
+#, fuzzy, 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 "
@@ -1676,11 +1764,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "Carregue em <command>ENTER</command>. Isto irá carregar e iniciar o kernel. "
 "O kernel irá mostrar as suas típicas mensagens de inicialização seguidas do "
@@ -1857,13 +1949,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "O gestor de arranque irá mostrar a sua linha de comandos após ter feito o "
 "download e processado o seu ficheiro de configuração. Neste ponto, a "
@@ -1879,13 +1977,22 @@ msgstr "Iniciar de TFTP em SGI"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -2072,9 +2179,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
-msgid ""
-"OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
+#, fuzzy, 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 "
@@ -2172,7 +2285,28 @@ msgstr "Arrancar Macs NewWorld a partir de OpenFirmware"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -2191,7 +2325,7 @@ msgid ""
 "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."
+"userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
 "Já terá colocado os ficheiros <filename>vmlinux</filename>, <filename>initrd."
 "gz</filename>, <filename>yaboot</filename>, e <filename>yaboot.conf</"
@@ -2809,8 +2943,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Parâmetros de instalação Debian"
 
 #. Tag: para
@@ -3009,9 +3144,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -3195,12 +3334,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 "Definido como <userinput>true</userinput> para habilitar o suporte para "
 "discos RAID Serial ATA (também chamado de ATA RAID, BIOS RAID ou 'fake "
@@ -3554,14 +3699,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "Por omissão o instalador irá utilizar o protocolo http para fazer download "
 "aos ficheiros em mirrors Debian e mudar isso para ftp não é possível durante "
@@ -4059,10 +4211,13 @@ msgstr "Disquetes de confiança"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "O maior problema para as pessoas que utilizam disquetes para instalar Debian "
 "parece ser a confiança na duração das disquetes."
@@ -4569,14 +4724,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "Se tem um sistema Debian funcional, a forma mais fácil de enviar relatórios "
 "de instalação é instalar os pacotes <classname>installation-report</"
diff --git a/po/pt/boot-new.po b/po/pt/boot-new.po
index 3f9fca5ea..020b25714 100644
--- a/po/pt/boot-new.po
+++ b/po/pt/boot-new.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-new\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-11 11:54+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -18,8 +18,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "A Iniciar O Seu Novo Sistema Debian"
 
 #. Tag: title
@@ -40,13 +41,21 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:13
-#, no-c-format
+#, fuzzy, 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><phrase "
+#| "arch=\"x86\"> or possibly the <classname>lilo</classname> bootloader</"
+#| "phrase>. 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -60,11 +69,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -79,13 +95,25 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:32
-#, no-c-format
+#, fuzzy, 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 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 "
+"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 "
@@ -572,11 +600,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/pt/hardware.po b/po/pt/hardware.po
index 86c50fa8e..67f3e6bf4 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -25,10 +25,14 @@ msgstr "Requisitos do Sistema"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "Esta secção contém informação acerca de que hardware é necessário para se "
@@ -43,33 +47,31 @@ msgstr "Hardware Suportado"
 
 #. Tag: para
 #: hardware.xml:21
-#, no-c-format
+#, fuzzy, 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;."
+#| "the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+#| "architecture or platform to which the Linux or kFreeBSD 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 architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "Debian não impõe requisitos de hardware para além do que é requerido pelo "
-"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>."
+"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>."
 
 #. Tag: para
 #: hardware.xml:32
@@ -91,9 +93,12 @@ msgstr "Arquitecturas Suportadas"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
 msgstr ""
 "Debian GNU/Linux &release; suporta onze arquitecturas de maior relevo e "
@@ -107,8 +112,9 @@ msgstr "Arquitectura"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Designação Debian"
 
 #. Tag: entry
@@ -455,8 +461,9 @@ msgstr "tape"
 
 #. Tag: para
 #: hardware.xml:169
-#, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+#, fuzzy, no-c-format
+#| msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr "Debian GNU/kFreeBSD &release; suporta duas arquitecturas."
 
 #. Tag: entry
@@ -473,25 +480,25 @@ msgstr "kfreebsd-amd64"
 
 #. Tag: para
 #: hardware.xml:196
-#, no-c-format
+#, fuzzy, 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."
+#| "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."
 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."
+"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 ""
 "Este documento cobre a instalação para a arquitectura <emphasis>&arch-title; "
 "</emphasis> utilizando o <emphasis>&arch-kernel;</emphasis>. Se está à "
-"procura "
-"de informação acerca de qualquer uma das outras arquitecturas suportadas por "
-"Debian veja a página dos <ulink url=\"http://www.debian.org/ports/\">"
-"Debian-Ports</ulink>."
+"procura de informação acerca de qualquer uma das outras arquitecturas "
+"suportadas por Debian veja a página dos <ulink url=\"http://www.debian.org/"
+"ports/\">Debian-Ports</ulink>."
 
 #. Tag: para
 #: hardware.xml:206
@@ -512,15 +519,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. "
@@ -540,8 +538,8 @@ msgstr ""
 "de Bugs</ulink> para relatar quaisquer problemas; não se esqueça de "
 "mencionar o facto que o bug está presente na arquitectura &arch-title; "
 "utilizando o kernel <emphasis>&arch-kernel;</emphasis>. Pode ser necessário "
-"usar também a <ulink url=\"&url-list-subscribe;\"> "
-"mailing list debian-&arch-listname;</ulink>"
+"usar também a <ulink url=\"&url-list-subscribe;\"> mailing list debian-&arch-"
+"listname;</ulink>"
 
 #. Tag: title
 #: hardware.xml:239 hardware.xml:275 hardware.xml:381 hardware.xml:400
@@ -576,11 +574,16 @@ msgstr "São suportados ambos os processadores AMD64 e Intel EM64T."
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Cada arquitectura ARM distinta necessita do seu próprio kernel. Devido a "
@@ -590,10 +593,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "A maioria dos CPUs ARM podem correr em qualquer modo endian (big ou little). "
@@ -614,14 +621,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "A linha Intel de processadores I/O (IOP) é encontrada num número de produtos "
 "relacionados com o armazenamento de dados e processamento. Debian "
@@ -717,10 +732,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 "A plataforma Versatile é emulada pelo QEMU e por isso é uma boa forma de "
 "testar e correr Debian em ARM se não tiver o hardware."
@@ -761,24 +779,43 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:417
-#, no-c-format
+#, fuzzy, 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\", 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>."
+"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>."
 msgstr ""
 "No entanto, Debian GNU/Linux &releasename; <emphasis>não</emphasis> irá "
 "correr em processadores 386 ou anteriores. Apesar do nome da arquitectura "
@@ -835,22 +872,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
+#, fuzzy, 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> "
+"&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> </"
+"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>."
+"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>."
 msgstr ""
 "Debian em &arch-title; suporta as seguintes plataformas: <itemizedlist> "
 "<listitem><para> SGI IP22: esta plataforma inclui as máquinas Indy da SGI, "
@@ -869,10 +921,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -895,17 +952,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
+#, fuzzy, 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> "
+"&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 "
+"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 "
+"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>."
@@ -969,9 +1039,12 @@ msgstr "Kernel Flavours"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
 "Existem dois flavours principais do kernel powerpc em Debian, baseado no "
@@ -1049,12 +1122,17 @@ msgstr "Sub-arquitectura Power Macintosh (pmac)"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "A Apple (e brevemente outros fabricantes como, por exemplo, &mdash; Power "
 "Computing) fizeram uma série de computadores Macintosh baseados no "
@@ -1482,18 +1560,29 @@ msgstr "Sub-arquitectura Nubus PowerMac (não suportada)"
 
 #. Tag: para
 #: hardware.xml:952
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "Os sistemas NuBus não são actualmente suportados pelo debian/powerpc. O "
 "kernel monolítico Linux/PPC não tem actualmente suporte para estas máquinas; "
@@ -1630,11 +1719,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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 "
@@ -1724,11 +1817,18 @@ msgstr "Múltiplos Processadores"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1742,21 +1842,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1138
-#, no-c-format
+#, fuzzy, 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 "
+#| "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 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>"
+"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 ""
 "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 "
@@ -1767,11 +1867,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1785,23 +1892,33 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"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."
 
 #. Tag: para
 #: hardware.xml:1172
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Suporte para múltiplos processadores &mdash; também conhecido por "
 "<quote>symmetric multi-processing</quote> ou SMP &mdash; está disponível "
@@ -1812,17 +1929,17 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1181
-#, no-c-format
+#, fuzzy, 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 "
+#| "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 "
+"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;</"
@@ -1837,14 +1954,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "Suporte para múltiplos processadores &mdash; também conhecido por "
 "<quote>symmetric multi-processing</quote> ou SMP &mdash; está disponível "
@@ -1869,13 +1994,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1211
 #, 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="
@@ -1914,13 +2032,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, 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;."
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"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 e "
@@ -2164,14 +2288,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, no-c-format
+#, fuzzy, 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 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>"
+"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 ""
 "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 "
@@ -2455,9 +2586,15 @@ msgstr "Comprar Hardware Especificamente para GNU/&arch-kernel; "
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2614,12 +2751,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:1654
 #, 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 "
@@ -2631,10 +2762,9 @@ msgstr ""
 "Você pode ajudar a melhorar esta situação encorajando estes fabricantes a "
 "divulgar a documentação e outros recursos necessários para que possamos "
 "programar o hardware deles, mas a melhor estratégia é simplesmente evitar "
-"este "
-"género de hardware até serem listados como funcionais no "
-"<ulink url=\"&url-hardware-howto;\">HOWTO de Compatibilidade de Hardware em "
-"Linux</ulink>."
+"este género de hardware até serem listados como funcionais no <ulink url="
+"\"&url-hardware-howto;\">HOWTO de Compatibilidade de Hardware em Linux</"
+"ulink>."
 
 #. Tag: title
 #: hardware.xml:1672
@@ -2644,14 +2774,21 @@ msgstr "Meios de Instalação"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "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 "
@@ -2808,10 +2945,17 @@ msgstr "USB Memory Stick"
 
 #. Tag: para
 #: hardware.xml:1767
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2903,14 +3047,22 @@ msgstr "Sistemas de Armazenamento Suportados"
 
 #. Tag: para
 #: hardware.xml:1821
-#, no-c-format
+#, fuzzy, 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, which "
-"includes many drivers that won't be used for your machine<phrase arch="
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "Os discos de arranque Debian incluem um kernel que foi construído para "
@@ -2923,11 +3075,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Geralmente, o sistema de instalação de Debian inclui suporte para disquetes, "
diff --git a/po/pt/install-methods.po b/po/pt/install-methods.po
index 4a6450c73..401b22146 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -31,14 +31,28 @@ msgstr "Conjuntos Oficiais de CD-ROMs &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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -64,7 +78,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -73,7 +99,7 @@ msgid ""
 "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 "
+"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."
@@ -124,25 +150,33 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, no-c-format
+#| msgid "Downloading Files from Debian Mirrors"
+msgid "Downloading Files from &debian; Mirrors"
 msgstr "Download dos Ficheiros a partir dos Mirrors Debian"
 
 #. Tag: para
 #: install-methods.xml:85
-#, no-c-format
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "Para encontrar o mirror mais próximo (e provavelmente o mais rápido), visite "
 "a <ulink url=\"&url-debian-mirrors;\">lista de mirrors Debian</ulink>."
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Quando fizer download de ficheiros de um mirror Debian utilizando FTP, "
@@ -157,9 +191,15 @@ msgstr "Onde Encontrar Imagens de Instalação"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -221,10 +261,14 @@ msgstr "Ficheiros de Instalação do GLAN Tank"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "O GLAN Tank necessita de um kernel e ramdisk numa partição ext2 no disco "
@@ -239,10 +283,14 @@ msgstr "Ficheiros de Instalação do Kurobox Pro"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "A Kurobox Pro necessita de um kernel e ramdisk numa partição ext2 no disco "
@@ -401,12 +449,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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 ""
 "Antes de você poder criar as disquetes, primeiro você tem de fazer o "
 "download delas a partir de um dos mirrors Debian, conforme é explicado em "
@@ -561,10 +616,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "Estes utilitários podem ser encontrados nos CD-ROMs Oficiais de Debian no "
 "directório <filename>/tools</filename>."
@@ -577,10 +635,19 @@ msgstr "Escrever Imagens de Disco a partir de 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 "
+#, fuzzy, 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 "
 "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 "
@@ -621,12 +688,17 @@ msgstr "Escrever Imagens de Disco com <command>Disk Copy</command>"
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "Se está a criar as imagens de disquetes a partir de ficheiros que estavam "
 "originalmente no CD oficial &debian-gnu;, então o Type e Creator já estão "
@@ -773,12 +845,6 @@ msgstr "Preparar Ficheiros para iniciar a partir de USB Memory Stick"
 #. 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 "
@@ -787,10 +853,9 @@ msgid ""
 "with a mirror."
 msgstr ""
 "Existem dois métodos de instalação possíveis ao arrancar a partir de uma "
-"'pen' "
-"USB. O primeiro é utilizar a pen sub para arrancar o instalador, e depois "
-"instalar tudo a partir da rede. O segundo é copiar também uma imagem de CD "
-"para a 'pen' USB e utiliza-la como fonte de pacotes, possivelmente em "
+"'pen' USB. O primeiro é utilizar a pen sub para arrancar o instalador, e "
+"depois instalar tudo a partir da rede. O segundo é copiar também uma imagem "
+"de CD para a 'pen' USB e utiliza-la como fonte de pacotes, possivelmente em "
 "combinação com um 'mirror'."
 
 #. Tag: para
@@ -834,11 +899,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 "
@@ -851,11 +911,10 @@ msgstr ""
 "Para preparar uma 'pen' USB que apenas arranca o instalador, e que depois "
 "prossegue com a instalação totalmente a partir da rede, vai necessitar obter "
 "a imagem <filename>mini.iso</filename> a partir do directório "
-"<filename>netboot</filename> (no local mencionado em "
-"<xref linkend=\"where-files\"/>), e escrever este ficheiro directamente na "
-"'pen' "
-"USB, sobrescrevendo o seu conteúdo actual. Este método irá funcionar com "
-"'pens' USB de capacidade reduzida, apenas com alguns megabytes."
+"<filename>netboot</filename> (no local mencionado em <xref linkend=\"where-"
+"files\"/>), e escrever este ficheiro directamente na 'pen' USB, "
+"sobrescrevendo o seu conteúdo actual. Este método irá funcionar com 'pens' "
+"USB de capacidade reduzida, apenas com alguns megabytes."
 
 #. Tag: para
 #: install-methods.xml:570
@@ -874,16 +933,14 @@ msgid ""
 msgstr ""
 "Por exemplo, ao utilizar um sistema GNU/Linux existente, o ficheiro "
 "<filename>mini.iso</filename> pode ser escrito numa 'pen' USB da seguinte "
-"forma: "
-"<informalexample><screen>\n"
+"forma: <informalexample><screen>\n"
 "# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
 "# sync\n"
 "</screen></informalexample> Para acrescentar firmware a uma 'pen' USB "
 "preparada desta forma, obtenha os ficheiros de firmware necessários. Veja "
 "<xref linkend=\"loading-firmware\"/> para mais informações. De seguida "
-"retire e "
-"volte a colocar a 'pen' USB, e agora devem ser visíveis duas partições. Deve "
-"montar a segunda partição, e descompactar o firmware para lá."
+"retire e volte a colocar a 'pen' USB, e agora devem ser visíveis duas "
+"partições. Deve montar a segunda partição, e descompactar o firmware para lá."
 
 #. Tag: screen
 #: install-methods.xml:582
@@ -904,18 +961,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</"
@@ -961,12 +1006,6 @@ msgstr "Copiar ficheiros &mdash; a maneira simples"
 #. 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="
@@ -1034,14 +1073,23 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -1093,7 +1141,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:685
-#, no-c-format
+#, fuzzy, 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 "
@@ -1104,7 +1164,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "Dado que a maioria das 'pens' USB vêm preconfiguradas com uma única partição "
 "FAT16, provavelmente não terá de reparticionar ou reformatar a 'pen'. Se de "
@@ -1220,10 +1280,18 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:768
-#, no-c-format
+#, fuzzy, 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 "
+"&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> "
@@ -1240,7 +1308,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1253,7 +1334,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "A maioria das 'pens' USB não vêm configurados de forma a que o Open Firmware "
 "possa arrancar a partir delas, por isso vai necessitar de reparticionar a "
@@ -1395,12 +1476,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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 ""
 "Se utilizou uma imagem <filename>hd-media</filename>, deve agora copiar uma "
 "imagem ISO Debian (businesscard, netinst, ou imagem completa de CD; assegure-"
@@ -1534,20 +1620,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:960
-#, 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/</"
-#| "filename>."
+#| "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>."
 msgid ""
-"Copy the following files from the Debian archives to a convenient location "
+"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 ""
 "Copie os seguintes ficheiros dos arquivos Debian para uma localização "
 "conveniente no seu disco, (note que o LILO não consegue arrancar a partir de "
-"ficheiros num sistema de ficheiros NTFS) por exemplo para a <filename>"
-"/boot/newinstall/</filename>."
+"ficheiros num sistema de ficheiros NTFS) por exemplo para a <filename>/boot/"
+"newinstall/</filename>."
 
 #. Tag: para
 #: install-methods.xml:968
@@ -1574,19 +1660,12 @@ 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 "Arrancar o Instalador de disco rígido com o <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>."
@@ -1596,21 +1675,20 @@ msgstr ""
 
 #. 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:\\</filename>."
+"Copy the following files 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
 #, no-c-format
-#| msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
 msgstr ""
@@ -1619,7 +1697,6 @@ msgstr ""
 #. 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> (ferramenta loadlin)"
 
@@ -1631,14 +1708,24 @@ msgstr "Instalador para Disco Rígido para Macs OldWorld"
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1654,12 +1741,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1709,10 +1808,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1837,10 +1941,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "Algumas máquinas mais antigas HPPA (ex.: 715/75) usam RBOOTD em vez de "
 "BOOTP. Está disponível um pacote <classname>rbootd</classname> em Debian."
@@ -2119,13 +2226,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2258,10 +2396,16 @@ 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 "
+#, fuzzy, 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."
@@ -2275,10 +2419,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2477,38 +2634,43 @@ msgstr "Instalação Automática"
 
 #. Tag: para
 #: install-methods.xml:1591
-#, no-c-format
+#, fuzzy, 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."
+#| "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."
 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 "
+"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 ""
 "É 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 "
+"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
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Automatic Installation Using the Debian Installer"
+msgid "Automatic Installation Using the &debian; Installer"
 msgstr "Instalação Automática Utilizando o Instalador Debian"
 
 #. Tag: para
 #: install-methods.xml:1604
-#, no-c-format
+#, fuzzy, 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 "
+"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."
diff --git a/po/pt/installation-howto.po b/po/pt/installation-howto.po
index 80bd8122e..614b7861c 100644
--- a/po/pt/installation-howto.po
+++ b/po/pt/installation-howto.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: howto 24602\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-11 12:12+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -90,12 +90,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "Alguns métodos de instalação requerem outras imagens para além das de CD. "
 "<phrase condition=\"unofficial-build\">A <ulink url=\"&url-d-i;\">página "
@@ -168,11 +173,15 @@ msgstr "Disquete"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Se não consegue arrancar a partir de CD, pode efectuar o download das "
 "imagens de disquete para instalar o Debian. Precisa de <filename>floppy/boot."
@@ -244,10 +253,14 @@ msgstr "USB memory stick"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "É também possível instalar a partir de um dispositivo amovível USB. Um porta-"
@@ -256,14 +269,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -362,12 +384,21 @@ msgstr "Iniciar de disco rígido"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -483,12 +514,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "Se tiver uma partição de Windows ou DOS que quer preservar, seja cuidadoso "
@@ -658,10 +695,13 @@ msgstr "E finalmente&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"We hope that your &debian; installation is pleasant and that you find "
+"&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
 msgstr ""
 "Esperamos que a sua instalação de Debian seja agradável e que considere o "
 "Debian útil. Você pode querer ler o <xref linkend=\"post-install\"/>."
diff --git a/po/pt/partitioning.po b/po/pt/partitioning.po
index 96691de0f..83591e109 100644
--- a/po/pt/partitioning.po
+++ b/po/pt/partitioning.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partitioning\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-11 12:15+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -19,14 +19,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, no-c-format
+#| msgid "Partitioning for Debian"
+msgid "Partitioning for &debian;"
 msgstr "Particionar para Debian"
 
 #. Tag: title
 #: partitioning.xml:13
-#, no-c-format
-msgid "Deciding on Debian Partitions and Sizes"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "Decidir o Tamanho e Partições do Debian"
 
 #. Tag: para
@@ -126,14 +128,21 @@ msgstr "A Árvore de Directórios"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "&debian-gnu; adere ao <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
 "Standard</ulink> para os directórios e nomes de ficheiros. Este padrão "
@@ -411,15 +420,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -485,9 +507,16 @@ msgstr "Esquema Recomendado de Particionamento"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -518,17 +547,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Você precisará necessitar de ter <filename>/usr/local</filename> como "
 "partição separada se planear instalar muitos programas que não fazem parte "
@@ -832,15 +871,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, no-c-format
+#| msgid "Debian Partitioning Programs"
+msgid "&debian; Partitioning Programs"
 msgstr "Programas de Particionamento Debian"
 
 #. Tag: para
 #: partitioning.xml:436
-#, no-c-format
-msgid ""
-"Several varieties of partitioning programs have been adapted by Debian "
+#, fuzzy, 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."
@@ -858,9 +903,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -1073,14 +1123,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "Se tem outro sistema operativo existente tal como o DOS ou Windows e quer "
@@ -1170,12 +1228,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/pt/post-install.po b/po/pt/post-install.po
index f457d1be3..0abb41014 100644
--- a/po/pt/post-install.po
+++ b/po/pt/post-install.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: post-install\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-09 15:19+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -96,7 +96,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -104,7 +113,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "O Linux é uma implementação de Unix. O <ulink url=\"&url-ldp;\"> Projecto de "
@@ -118,19 +127,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "Oriente-se Para Debian"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "O Debian é ligeiramente diferente das outras distribuições. Mesmo se está "
@@ -142,15 +159,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "Sistema de Pacotes Debian"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -290,13 +323,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"filename>. To read about &debian;-specific issues for particular programs, "
 "look at <filename>/usr/share/doc/(package name)/README.Debian</filename>."
 msgstr ""
 "Há uma grande quantidade de informação útil em <filename>/usr/share/doc</"
@@ -309,19 +350,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "O <ulink url=\"http://www.debian.org/\">website Debian</ulink> contém uma "
 "grande quantidade de documentação acerca de Debian. Veja em particular o "
@@ -358,12 +413,17 @@ msgstr "Configurar o Seu Sistema Para Utilizar E-Mail"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "Actualmente, o email é uma parte importante da vida de muitas pessoas. Como "
 "existem muitas opções para o configurar, e tê-lo correctamente configurado é "
@@ -420,17 +480,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "Com a crescente popularidade dos sistemas desktop gráficos, a utilização de "
@@ -519,10 +590,14 @@ msgstr "Enviar E-Mails Para Fora do Sistema"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Tal como foi mencionado anteriormente, o sistema Debian instalado é apenas "
@@ -561,13 +636,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "No entanto, nesse caso pode ter de configurar utilitários individuais para "
 "enviar e-mails correctamente. Um desses utilitários é o <command>reportbug</"
@@ -795,11 +876,18 @@ msgstr "Compilando um Novo Kernel"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -872,9 +960,15 @@ msgstr "Não tenha medo de tentar compilar o kernel. É divertido e lucrativo."
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -903,10 +997,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -959,7 +1060,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -971,7 +1085,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "Agora, pode configurar o seu kernel. Corra <userinput>make xconfig</"
@@ -1065,9 +1179,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1146,13 +1266,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 "
@@ -1205,4 +1318,3 @@ msgstr ""
 "Finalmente, note que reparar sistemas estragados pode ser difícil, e este "
 "manual não tenta desenvolver todas as coisas que possam ter corrido mal e "
 "como as corrigir. Se você tiver problemas, consulte um especialista."
-
diff --git a/po/pt/preface.po b/po/pt/preface.po
index 3d3df72e7..5c2650afe 100644
--- a/po/pt/preface.po
+++ b/po/pt/preface.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preface.xml 24750\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2005-01-31 21:01+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -21,13 +21,19 @@ msgstr "Instalar &debian-gnu; &release; para &architecture;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Nós estamos deliciados que você tenha decidido experimentar Debian, e temos "
 "a certeza que você vai achar a distribuição Debian GNU/&arch-kernel; única. "
@@ -37,10 +43,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/pt/preparing.po b/po/pt/preparing.po
index 32e5c7306..83fe52d1b 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -25,9 +25,13 @@ msgstr "Antes de Instalar &debian-gnu;"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -44,11 +48,15 @@ msgstr "Vista Geral do Processo de Instalação"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "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 "
@@ -71,15 +79,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -127,16 +146,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, no-c-format
+#| msgid "Create partitionable space for Debian on your hard disk."
+msgid "Create partitionable space for &debian; on your hard disk."
 msgstr "Criar espaço para partições para o Debian no seu disco rígido."
 
 #. Tag: para
 #: preparing.xml:73
-#, no-c-format
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "Localizar e/ou fazer o download do instalador e de alguns ficheiros de "
 "drivers específicos que a sua máquina necessite (excepto utilizadores do CD "
@@ -144,9 +167,12 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "Preparar tapes/disquetes/sticks USB de arranque, ou colocar ficheiros de "
@@ -192,8 +218,9 @@ msgstr "Ligar um ou mais DASDs (Direct Access Storage Device)."
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 "Criar e montar as partições nas quais Debian vai ser instalado."
 
 #. Tag: para
@@ -225,11 +252,6 @@ msgstr "Carregar o sistema acabado de instalar pela primeira vez."
 #. 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 "
@@ -239,8 +261,7 @@ msgstr ""
 "Para &arch-title; você tem a opção de utilizar <phrase arch=\"any-x86\">uma</"
 "phrase> uma versão gráfica <phrase arch=\"powerpc\">experimental</phrase> do "
 "sistema de instalação. Para mais informações acerca deste instalador "
-"gráfico, "
-"veja <xref linkend=\"graphical\"/>."
+"gráfico, veja <xref linkend=\"graphical\"/>."
 
 #. Tag: para
 #: preparing.xml:149
@@ -406,10 +427,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -419,10 +445,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "O documento que está a ler agora, é uma versão de desenvolvimento do Guia de "
@@ -503,10 +533,14 @@ msgstr "Linux para &arch-title;"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "O IBM Redbook descreve as distribuições de Linux disponíveis para o "
@@ -1111,11 +1145,19 @@ msgstr "5 gigabytes"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1172,12 +1214,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1229,10 +1281,10 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:759
-#, no-c-format
+#, fuzzy, no-c-format
 #| msgid ""
-#| "If you already have an operating system on your system <phrase arch="
-#| "\"x86\"> (Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, "
+#| "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 "
@@ -1244,32 +1296,25 @@ 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 "
+"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."
+"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, 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."
+"Se você já possui um sistema operativo no seu sistema <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> 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
 #, 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-"
@@ -1279,8 +1324,8 @@ msgid ""
 "show existing partitions without making changes."
 msgstr ""
 "Você pode encontrar informação acerca da sua configuração actual de "
-"partições utilizando uma ferramenta de particionamento para o seu  "
-"sistema operativo actual, <phrase arch=\"any-x86\"> tal como o fdisk ou o "
+"partições utilizando uma ferramenta de particionamento para o seu  sistema "
+"operativo actual, <phrase arch=\"any-x86\"> tal como o fdisk ou o "
 "PartitionMagic</phrase><phrase arch=\"powerpc\">, tal como o Drive Setup, HD "
 "Toolkit, ou MacTools</phrase><phrase arch=\"s390\">, tal como o VM diskmap</"
 "phrase>. As ferramentas de particionamento têm sempre uma forma de mostrar "
@@ -1310,10 +1355,15 @@ msgstr "FIXME: escrever acerca de discos HP-UX?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1352,11 +1402,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1371,10 +1428,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "Se a sua máquina tem um sistema de ficheiros FAT ou NTFS, tal como os "
@@ -1384,11 +1445,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1406,12 +1476,19 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:849
-#, no-c-format
+#, fuzzy, 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."
+"&debian; installation. Windows and other OS installations may destroy your "
+"ability to start &debian;, or encourage you to reformat non-native "
+"partitions."
 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 "
@@ -1431,7 +1508,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:862
-#, no-c-format
+#, fuzzy, 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, "
@@ -1439,8 +1526,8 @@ msgid ""
 "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."
+"can delete the placeholder with the &debian; partition tools later during "
+"the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 "De modo que o OpenFirmware possa iniciar automaticamente &debian-gnu; as "
 "partições de &arch-parttype; devem aparecer antes das outras partições no "
@@ -1454,11 +1541,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "Se actualmente tem um disco rígido com uma partição (uma configuração usual "
 "para computadores desktop), e deseja ter multi-boot entre o sistema "
@@ -1503,18 +1594,22 @@ msgstr "Instalar o sistema operativo nativo na sua nova partição."
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "Arrancar de novo para o sistema nativo para verificar que está tudo OK, e "
 "fazer o download dos ficheiros de arranque do instalador de Debian."
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, fuzzy, no-c-format
+#| msgid "Boot the Debian installer to continue installing Debian."
+msgid "Boot the &debian; installer to continue installing &debian;."
 msgstr ""
 "Arrancar com o instalador de Debian para continuar a instalação de Debian."
 
@@ -1526,12 +1621,17 @@ msgstr "Particionar a partir de DOS ou Windows"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "Se está a manipular partições FAT ou NTFS existentes, é recomendado que "
 "utilize o esquema abaixo ou utilitários nativos de Windows ou DOS. Caso "
@@ -1541,13 +1641,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1570,11 +1678,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1595,14 +1714,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 ""
 "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 "
@@ -1631,17 +1757,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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 ""
 "A primeira coisa necessária é uma cópia de <command>fips</command> que está "
@@ -1707,11 +1844,17 @@ msgstr "Particionar para DOS"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1724,12 +1867,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "Aparentemente, quando você criar ou redimensionar uma partição para utilizar "
 "com o DOS, é uma boa ideia encher os primeiros sectores com zeros. Deve "
@@ -1750,11 +1898,18 @@ msgstr "Particionar em SunOS"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1898,10 +2053,18 @@ msgstr "Pré-Instalação do Hardware e Configuração do Sistema Operativo"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1924,13 +2087,21 @@ msgstr "Invocar o Menu de Configuração da BIOS"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "A BIOS disponibiliza as funções básicas necessárias para arrancar a sua "
 "máquina e permitir ao seu sistema operativo aceder ao seu hardware. "
@@ -2064,7 +2235,16 @@ msgstr "Selecção de Dispositivo Para Arranque"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -2072,7 +2252,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "Os menus de configuração de muitas BIOS permitem-lhe seleccionar os "
 "dispositivos utilizados para o arranque do sistema. Defina esta opção para "
@@ -2724,17 +2904,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "Antes de você fazer realmente uma instalação, você tem de percorrer algumas "
 "etapas de design e de preparação. A IBM tornou disponível documentação "
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index 387a88677..967429564 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -339,12 +339,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 "
@@ -360,26 +354,18 @@ msgstr ""
 "Para os outros métodos de preseed tem de indicar ao instalador qual o "
 "ficheiro a utilizar quando o arranca. Isto é normalmente feito ao passar um "
 "argumento de arranque ao kernel, quer manualmente no arranque do sistema ou "
-"ao editar o ficheiro de configuração do gestor de arranque "
-"<phrase arch=\"linux-any\">(p.e. <filename>syslinux.cfg</filename>) e "
-"adicionar "
-"esse parâmetro ao final da(s) linha(s) de \"append\" para o kernel.</phrase> "
+"ao editar o ficheiro de configuração do gestor de arranque <phrase arch="
+"\"linux-any\">(p.e. <filename>syslinux.cfg</filename>) e adicionar esse "
+"parâmetro ao final da(s) linha(s) de \"append\" para o kernel.</phrase> "
 "<phrase arch=\"kfreebsd-any\">(p.e. <filename>grub.cfg</filename>) e "
-"acrescentar "
-"o parâmetro como uma nova linha <literal>set</literal> para o kernel.<"
-"/phrase> "
-"<phrase arch=\"hurd-any\">(p.e. <filename>grub.cfg</filename>) e acrescentar "
-"o "
-"parâmetro no final da linha <filename>gnumach.gz</filename>.</phrase>"
+"acrescentar o parâmetro como uma nova linha <literal>set</literal> para o "
+"kernel.</phrase> <phrase arch=\"hurd-any\">(p.e. <filename>grub.cfg</"
+"filename>) e acrescentar o parâmetro no final da linha <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 "
@@ -390,14 +376,11 @@ msgid ""
 msgstr ""
 "Se especificar um ficheiro de pré-configuração na configuração do gestor de "
 "arranque, você pode alterar a configuração de modo a não precisar de "
-"carregar "
-"em enter para arrancar o instalador. "
-"<phrase arch=\"linux-any\">Para o syslinux isto significa indicar "
-"o 'timeout' para <literal>1</literal> em <filename>syslinux.cfg</filename>. "
-"</phrase><phrase arch=\"kfrebsd-any;hurd-any\">Para o grub isto significa "
-"definir o 'timeout' para <literal>0</literal> em <filename>grub.cfg<"
-"/filename>. "
-"</phrase>"
+"carregar em enter para arrancar o instalador. <phrase arch=\"linux-any"
+"\">Para o syslinux isto significa indicar o 'timeout' para <literal>1</"
+"literal> em <filename>syslinux.cfg</filename>. </phrase><phrase arch="
+"\"kfrebsd-any;hurd-any\">Para o grub isto significa definir o 'timeout' para "
+"<literal>0</literal> em <filename>grub.cfg</filename>. </phrase>"
 
 #. Tag: para
 #: preseed.xml:274
@@ -625,12 +608,26 @@ msgstr "Modo 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"
+#, fuzzy, 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 "
+"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 "
@@ -1038,14 +1035,22 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "Também é possível utilizar DHCP para especificar um ficheiro de pré-"
@@ -1085,13 +1090,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"automate &debian; installs should only be done with care."
 msgstr ""
 "Uma boa forma de utilizar o preseed de DHCP é fazer o preseed apenas de "
 "valores específicos para a sua rede, tais como o mirror Debian a utilizar. "
diff --git a/po/pt/random-bits.po b/po/pt/random-bits.po
index fe3e407e1..9076164be 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -852,7 +852,16 @@ msgstr "Instalar &debian-gnu; a partir de um sistema Unix/Linux"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -861,7 +870,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "Esta secção explica como instalar &debian-gnu; a partir de um sistema Unix "
 "ou Linux existente, sem utilizar o instalador guiado pelo menu como é "
@@ -875,13 +884,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Assim que tiver o novo sistema Debian configurado de acordo com as suas "
 "preferências, você pode migrar os dados existentes dos utilizadores (se os "
@@ -892,11 +907,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:383
-#, no-c-format
+#, fuzzy, 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 "
-"also require more knowledge of Debian and of &arch-kernel; in general than "
+"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 "
@@ -955,10 +979,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -1007,17 +1041,28 @@ msgstr "Instalar <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:442
-#, no-c-format
+#, fuzzy, 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 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>."
+"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 ""
 "O utilitário utilizado pelo instalador Debian, e reconhecido como a forma "
 "oficial de instalar um sistema base Debian, é o <command>debootstrap</"
@@ -1032,14 +1077,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1077,10 +1133,16 @@ msgstr "Corra <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1142,13 +1204,20 @@ msgstr "Configurar o Sistema Base"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
+#, fuzzy, 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. "
+"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:"
+"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"
@@ -1243,7 +1312,48 @@ msgstr "Partições a Montar"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1270,7 +1380,7 @@ msgid ""
 "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 "
+"</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"
@@ -1626,12 +1736,17 @@ msgstr "Configurar o Boot Loader"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "Para tornar o seu sistema &debian-gnu; iniciável, prepare o gestor de "
 "arranque para carregar o kernel instalado com a sua nova partição raiz. Note "
@@ -1641,21 +1756,22 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:753
-#, no-c-format
+#, fuzzy, 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)."
+#| "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>."
 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 "
+"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 "
@@ -1737,11 +1853,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1836,12 +1960,19 @@ msgstr "Instalar &debian-gnu; a partir de uma linha IP Paralela (PLIP)"
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 "Esta secção explica como instalar &debian-gnu; num computador sem placa "
 "Ethernet, mas sim com apenas uma gateway remota ligada através de um cabo "
@@ -1897,10 +2028,13 @@ msgstr "Requisitos"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr ""
 "Um computador alvo, chamado <emphasis>target</emphasis>, onde será instalado "
 "Debian."
@@ -2342,11 +2476,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2359,11 +2500,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/pt/using-d-i.po b/po/pt/using-d-i.po
index b0ea6477c..0bcd8878d 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -20,8 +20,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "Utilizar o Instalador Debian"
 
 #. Tag: title
@@ -32,9 +33,15 @@ msgstr "Como Funciona o Instalador"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -370,8 +377,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Procura e monta um CD de instalação Debian."
 
 #. Tag: term
@@ -413,10 +421,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"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."
@@ -508,12 +519,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "Permite ao utilizador particionar discos ligados ao sistema, criar sistemas "
 "de ficheiros nas partições seleccionadas, e ligá-las aos pontos de montagem. "
@@ -714,11 +730,16 @@ msgstr "save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "Disponibiliza um modo do utilizador registar informação numa disquete , na "
 "rede, disco rígido, ou outro tipo de suporte quando é encontrado algum "
@@ -751,15 +772,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, no-c-format
+#| msgid "Setting up Debian Installer and Hardware Configuration"
+msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr "Preparar o Instalador Debian e a Configuração de Hardware"
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -963,11 +995,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -1166,18 +1204,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, no-c-format
+#| msgid "Looking for the Debian Installer ISO Image"
+msgid "Looking for the &debian; Installer ISO Image"
 msgstr "Procurar a Imagem ISO do Instalador do Debian"
 
 #. Tag: para
 #: using-d-i.xml:676
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Quando se instala através do método <emphasis>hd-media</emphasis>, existirá "
 "um momento em que você tem de encontrar e montar uma imagem iso do "
@@ -1186,7 +1230,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1197,9 +1255,9 @@ msgid ""
 "<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."
+"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 ""
 "Inicialmente, o <command>iso-scan</command> monta automaticamente todos os "
 "block devices (p. ex. partições) que tenham neles algum sistema de ficheiros "
@@ -2098,13 +2156,19 @@ msgstr "Particionamento Manual"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "Um ecrã similar ao que acabou de ser exibido será visualizado se tiver "
 "escolhido o particionamento manual, no entanto a sua actual tabela de "
@@ -4331,13 +4395,19 @@ msgstr "Detecção de outros sistemas operativos"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "Antes da instalação do gestor de arranque, o instalador tentará detectar "
 "outros sistemas operativos instalados na máquina. Se encontrar um sistema "
@@ -4499,17 +4569,22 @@ msgstr ""
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "nova partição Debian"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"will install itself at the beginning of the new &debian; partition and it "
+"will serve as a secondary boot loader."
 msgstr ""
 "Escolha esta opção para usar outro gestor de arranque. O <command>LILO</"
 "command> instalar-se-á no início da nova partição Debian e servirá como "
@@ -4537,13 +4612,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "Se não conseguir voltar a arrancar o Windows 9x (ou o DOS) depois deste "
 "passo, terá que usar uma disquete de arranque do Windows 9x (MS-DOS) e "
@@ -4692,10 +4773,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4712,11 +4798,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
 msgstr ""
 "Este é o sistema de ficheiros original utilizados para arrancar o kernel. É "
@@ -4752,12 +4844,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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 ""
 "É o kernel comprimido. É uma cópia do ficheiro referido em <filename>/etc/"
 "elilo.conf</filename>. Numa instalação normal do Debian este ficheiro "
@@ -5034,9 +5131,13 @@ msgstr "Terminar a Instalação"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -5103,11 +5204,15 @@ msgstr "Reiniciar o Sistema"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Ser-lhe-á pedido que remova o meio de arranque (CD, disquete, etc) que "
 "utilizou para arrancar o instalador. Depois disso o sistema irá reiniciar já "
@@ -5153,11 +5258,15 @@ msgstr "Gravar os logs de instalação"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "Se a instalação tiver sucesso, os ficheiros de log criados durante o "
 "processo de instalação serão automaticamente gravados em <filename>/var/log/"
@@ -5637,12 +5746,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="
@@ -5651,12 +5754,10 @@ msgid ""
 "the file system on the medium."
 msgstr ""
 "Estão disponíveis ficheiros 'tarball' e zip, contendo os pacotes actuais "
-"para "
-"o firmware mais comum, a partir de: <itemizedlist> <listitem><para> <ulink "
-"url=\"&url-firmware-tarballs;\"></ulink> </para></listitem> </itemizedlist> "
-"Faça "
-"apenas o download do ficheiro 'tarball' ou zip do lançamento correcto e "
-"descompacte-o para o sistema de ficheiros na media."
+"para o firmware mais comum, a partir de: <itemizedlist> <listitem><para> "
+"<ulink url=\"&url-firmware-tarballs;\"></ulink> </para></listitem> </"
+"itemizedlist> Faça apenas o download do ficheiro 'tarball' ou zip do "
+"lançamento correcto e descompacte-o para o sistema de ficheiros na media."
 
 #. Tag: para
 #: using-d-i.xml:3443
diff --git a/po/pt/welcome.po b/po/pt/welcome.po
index 0142bb946..a39b191c5 100644
--- a/po/pt/welcome.po
+++ b/po/pt/welcome.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-10-09 12:47+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -19,17 +19,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "Bem-vindo a Debian"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Este capítulo pretende dar a conhecer, de uma forma geral, o Debian Project "
 "e &debian-gnu;. Se já conhece a história do Debian Project e a distribuição "
@@ -381,17 +386,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Linux?"
+msgid "What is &debian; GNU/Linux?"
 msgstr "O que é Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
-#, no-c-format
+#, fuzzy, 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 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 "
+"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 "
@@ -414,9 +431,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -429,12 +451,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debian é especialmente popular entre utilizadores mais avançados devido à "
 "sua excelência técnica e ao seu profundo compromisso com as necessidades e "
@@ -443,9 +470,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -457,9 +489,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -471,11 +508,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -492,15 +538,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "Para proteger o seu sistema contra <quote>Cavalos de Tróia</quote> e outro "
 "software malévolo, os servidores Debian verificam se os pacotes lá colocados "
@@ -513,15 +567,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "O principal, e melhor, método para obter suporte para o seu sistema Debian "
 "GNU/Linux é comunicar com Debian Developers através das muitas mailing lists "
@@ -533,32 +595,40 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:315
-#, no-c-format
-#| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "O que é Debian GNU/kFreeBSD?"
 
 #. Tag: para
 #: welcome.xml:317
-#, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+#, fuzzy, no-c-format
+#| msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr "Debian GNU/kFreeBSD é um sistema Debian GNU com o kernel kFreeBSD."
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This port of Debian is currently only being developed for the i386 and "
+#| "amd64 architectures, although ports to other architectures is possible."
 msgid ""
-"This port of Debian is currently only being developed for the i386 and amd64 "
-"architectures, although ports to other architectures is possible."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
 "Este port de Debian actualmente é apenas desenvolvido para as arquitecturas "
 "i386 e amd64, embora sejam possível ports para outras arquitecturas. "
 
 #. Tag: para
 #: welcome.xml:326
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+#| "information on Linux system may not apply to it."
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 "Por favor note que Debian GNU/kFreeBSD não é um sistema Linux, e por isso "
@@ -566,33 +636,36 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:331
-#, no-c-format
+#, fuzzy, 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."
+#| "kfreebsd-gnu/\"> Debian GNU/kFreeBSD ports page</ulink> and the "
+#| "<email>debian-bsd@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 "
+"kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
-"Para mais informações, veja a <ulink url=\"http://www.debian."
-"org/ports/kfreebsd-gnu/"
-"\">Página do port Debian GNU/kFreeBSD</ulink> e a mailing list <email>"
-"debian-bsd@lists.debian.org</email>."
+"Para mais informações, veja a <ulink url=\"http://www.debian.org/ports/"
+"kfreebsd-gnu/\">Página do port Debian GNU/kFreeBSD</ulink> e a mailing list "
+"<email>debian-bsd@lists.debian.org</email>."
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "O que é Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
-#, no-c-format
+#, fuzzy, no-c-format
+#| 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."
 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."
+"&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 é um sistema Debian GNU com o GNU Hurd &mdash; um conjunto "
 "de servidores que correm sobre o microkernel GNU Mach."
@@ -600,13 +673,6 @@ 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 "
@@ -614,17 +680,18 @@ msgid ""
 "system becomes more stable."
 msgstr ""
 "O Hurd ainda não está terminado e não é adequado para o uso do dia-a-dia, "
-"mas "
-"trabalho continua. Actualmente, o Hurd está a ser desenvolvido apenas para a "
-"arquitectura i386, no entanto a conversão para outras arquitecturas será "
-"feita "
-"após o sistema se tornar mais estável."
+"mas trabalho continua. Actualmente, o Hurd está a ser desenvolvido apenas "
+"para a arquitectura i386, no entanto a conversão para outras arquitecturas "
+"será feita após o sistema se tornar mais estável."
 
 #. Tag: para
 #: welcome.xml:365
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+#| "information on Linux system may not apply to it."
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 "Por favor note que Debian GNU/Hurd não é um sistema Linux, e por isso alguma "
@@ -632,10 +699,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 "Para mais informações, veja a <ulink url=\"http://www.debian.org/ports/hurd/"
@@ -644,19 +715,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "Obter Debian"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Para informação de como fazer o download de &debian-gnu; através da Internet "
 "ou ainda para saber onde pode comprar os CDs Debian oficiais, veja <ulink "
@@ -667,9 +745,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -709,12 +791,17 @@ msgstr "Organização Deste Documento"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Este documento tem o propósito de servir como um manual para os que utilizam "
 "Debian pela primeira vez. Tenta fazer o mínimo de suposições quanto possível "
@@ -724,12 +811,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "Os utilizadores mais experientes podem também encontrar uma interessante "
 "referência de informação neste documento, incluindo os tamanhos para a "
@@ -763,12 +855,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Fazer cópias de segurança do seu sistema, executar o planeamento e "
 "configuração de hardware necessário antes de instalar Debian, no <xref "
@@ -798,15 +895,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "Fazer a instalação de acordo com o <xref linkend=\"d-i-intro\"/>. Isto "
@@ -830,11 +936,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "Assim que tiver o seu sistema instalado, você pode ler o <xref linkend="
 "\"post-install\"/>. Esse capítulo explica onde pode encontrar mais "
@@ -895,7 +1005,18 @@ msgstr "Acerca de Direitos de Cópia e Licenças de Software"
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -905,7 +1026,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Temos a certeza que você já leu algumas das licenças que vêm com a maioria "
 "do software comercial &mdash; estas geralmente dizem que você só pode "
@@ -940,16 +1061,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "O projecto Debian, como concessão pragmática aos seus utilizadores, torna "
 "disponíveis alguns pacotes que não preenchem os nossos critérios para serem "
@@ -962,7 +1092,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -971,10 +1113,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "Muitos dos programas no sistema são licenciados sob a <emphasis>GNU</"
 "emphasis> <emphasis>General Public License</emphasis>, muitas vezes referida "
@@ -990,13 +1132,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Existem algumas outras formas de afirmação de direitos de cópia e licenças "
 "de software utilizadas nos programas em Debian. Você pode encontrar os "
@@ -1007,9 +1155,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/ro/bookinfo.po b/po/ro/bookinfo.po
index dc34de41a..01b8b46b1 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -25,13 +25,19 @@ msgstr "&debian-gnu; - Ghid de instalare"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Acest document conţine instrucţiuni de instalare pentru sistemul &debian-"
 "gnu; &release; (nume de cod <quote>&releasename;</quote>), pentru "
@@ -42,17 +48,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/preface.po b/po/ro/preface.po
index 07b8d4e01..5a19f748d 100644
--- a/po/ro/preface.po
+++ b/po/ro/preface.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preface\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2005-11-24 01:18+0200\n"
 "Last-Translator: Eddy Petrişor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -25,13 +25,19 @@ msgstr "Instalarea &debian-gnu; &release; pentru &architecture;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Suntem încântaţi că v-aţi decis să încercaţi Debian, şi suntem siguri că "
 "veţi alfa că distribuiţia Debian GNU/&arch-kernel; este unică. &debian-gnu; "
@@ -41,10 +47,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/ro/using-d-i.po b/po/ro/using-d-i.po
index 4b6ed9cf2..1a19f1baa 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -19,8 +19,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "Cum se folosește Programul de instalare al Debian"
 
 #. Tag: title
@@ -31,9 +32,15 @@ msgstr "Cum funcționează programul de instalare"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -380,8 +387,9 @@ msgstr "detectorul de cdrom - cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Caută și montează un CD de instalare Debian."
 
 #. Tag: term
@@ -422,10 +430,13 @@ msgstr "alegătorul de arhive - choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr ""
 "Prezintă o listă situri cu arhivele Debian. Utilizatorul poate alege sursa "
 "pachetelor pe care le instalează."
@@ -516,12 +527,17 @@ msgstr "managerul de partiții - partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "Permite utilizatorului să partiționeze discurile atașate la sistem, creează "
 "sisteme de fișiere pe partițiile selectate și le atașează la punctele de "
@@ -722,11 +738,16 @@ msgstr "salvatorul de jurnale - save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 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, "
@@ -758,16 +779,27 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, no-c-format
+#| msgid "Setting up Debian Installer and Hardware Configuration"
+msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr ""
 "Pregătirea Programului de instalare al Debian și a configurației hardware"
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -976,7 +1008,7 @@ msgstr ""
 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 "
+"&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 ""
@@ -1158,18 +1190,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, no-c-format
+#| msgid "Looking for the Debian Installer ISO Image"
+msgid "Looking for the &debian; Installer ISO Image"
 msgstr "Căutarea imaginii ISO a Programului de instalare al Debian"
 
 #. Tag: para
 #: using-d-i.xml:676
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Când se instalează folosind metoda <emphasis>hd-media</emphasis>, va exista "
 "un moment când va trebui să găsiți și să montați imaginea iso a programului "
@@ -1178,7 +1216,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1189,9 +1241,9 @@ msgid ""
 "<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."
+"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 ""
 "La început, <command>iso-scan</command> montează automat toate dispozitivele "
 "bloc (ex.: partiții) care au un sistem de fișiere cunoscut pe ele și caută "
@@ -2077,13 +2129,19 @@ msgstr "Schema de partiționare"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "Un ecran similar cu cel dinainte va fi afișat dacă alegeți partiționarea "
 "manuală, cu excepția că va fi afișată tabela de partiții actuală și punctele "
@@ -4005,7 +4063,7 @@ msgid ""
 "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."
+"other operating system in addition to &debian;."
 msgstr ""
 
 #. Tag: para
@@ -4126,17 +4184,18 @@ msgstr ""
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
-msgstr ""
+#, fuzzy, no-c-format
+#| msgid "Created partitions"
+msgid "new &debian; partition"
+msgstr "Partiții create"
 
 #. 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."
+"will install itself at the beginning of the new &debian; partition and it "
+"will serve as a secondary boot loader."
 msgstr ""
 
 #. Tag: term
@@ -4163,7 +4222,7 @@ msgid ""
 "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!"
+"&debian;!"
 msgstr ""
 
 #. Tag: title
@@ -4269,7 +4328,7 @@ msgstr ""
 #, 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 "
+"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 ""
@@ -4286,7 +4345,7 @@ msgstr ""
 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</"
+"standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
 msgstr ""
 
@@ -4316,9 +4375,9 @@ msgstr ""
 #, 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>."
+"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 ""
 
 #. Tag: title
@@ -4523,7 +4582,7 @@ msgstr ""
 #: using-d-i.xml:3053
 #, no-c-format
 msgid ""
-"This is the last step in the Debian installation process during which the "
+"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 ""
@@ -4577,7 +4636,7 @@ msgstr ""
 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."
+"new &debian; system."
 msgstr ""
 
 #. Tag: para
@@ -4617,7 +4676,7 @@ msgstr ""
 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 
 #. Tag: para
diff --git a/po/ro/welcome.po b/po/ro/welcome.po
index c2484c3b6..a1e5d581d 100644
--- a/po/ro/welcome.po
+++ b/po/ro/welcome.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2006-08-20 14:57+0300\n"
 "Last-Translator: Eddy Petrişor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -20,17 +20,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "Bine aţi venit în Debian"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Acest capitol oferă o vedere de ansamblu asupra Proiectului Debian şi "
 "&debian-gnu;. Dacă cunoaşteţi deja cu isoria Proiectului Debian şi "
@@ -401,17 +406,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Linux?"
+msgid "What is &debian; GNU/Linux?"
 msgstr "Ce este Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
-#, no-c-format
+#, fuzzy, 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 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 "
+"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 "
@@ -433,9 +450,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -447,12 +469,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debian este în special popular printre utilizatorii avansaţi datorită "
 "calităţii sale tehnice excelente şi puternicii sale dedicări spre a "
@@ -461,9 +488,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -475,9 +507,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -489,11 +526,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -510,15 +556,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "Pentru a va proteja sistemul de <quote>cai troieni</quote> şi alte programe "
 "maliţioase, serverele Debian verifică şi faptul că pachetele publicate "
@@ -530,15 +584,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Metoda primordială, şi cea mai bună, de a primi suport pentru sistemul "
 "dumeavoastră Debian GNU/Linux şi de a comunica cu dezvoltatorii Debian este "
@@ -553,28 +615,42 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Ce este Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Debian GNU/Hurd este un sistem Debian GNU care înlocuieşte nucleul monolitic "
+"Linux cu GNU Hurd &mdash; un set de servere care rulează peste micronucleul "
+"GNU Mach. Hurd-ul este încă neterminat şi este nepotrivit pentru lucrul de "
+"zi cu zi, însă lucrul continuă. Hurd este în prezent dezvoltat numai pentru "
+"arhitectura i386, deşi portări la alte arhitecturi vor fi făcute odată ce "
+"sistemul devine mai stabil."
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -587,7 +663,7 @@ msgstr ""
 #| "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 "
+"kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
 "Pentru mai multe informaţii, a se vedea <ulink url=\"http://www.debian.org/"
@@ -596,16 +672,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "Ce este Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -635,16 +712,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 "Pentru mai multe informaţii, a se vedea <ulink url=\"http://www.debian.org/"
@@ -653,19 +734,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "Cum obţineţi Debian"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Pentru mai multe informaţii legate de felul în care se poate descărca "
 "&debian-gnu; de pe Internet sau de la cine se pot cumpăra CD-uri oficiale "
@@ -677,9 +765,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -718,12 +810,17 @@ msgstr "Organizarea acestui document"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Acest document este menit să servească pe post de manual pentru utilizatorii "
 "de Debian incepători. Încearcă să facă cât mai puţine presupuneri în "
@@ -733,12 +830,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "Utilizatorii experimenetaţi pot găsi şi ei informaţii interesante de "
 "referinţă, inclusiv dimensiunile minime de instalare, detalii legate de "
@@ -771,12 +873,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Faceţi o copie de siguranţă a sistemului, planificaţi şi configuraţi, în caz "
 "că este nevoie, componentele, înainte de a instala Debian în <xref linkend="
@@ -806,15 +913,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "Efectuarea propriu-zisă a instalării, conform cu <xref linkend=\"d-i-intro\"/"
@@ -838,11 +954,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "Odată instalat sistemul dumneavoastră, puteţi citi <xref linkend=\"post-"
 "install\"/>. Acel capitol explică unde trebuie să căutaţi mai multe "
@@ -923,7 +1043,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Suntem siguri că aţi citit câteva dintre licenţele care vin cu majoritatea "
 "programeleor comerciale &mdash; de obicei spun că puteţi folosi doar o copie "
@@ -958,16 +1078,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "Proiectul Debian, ca o concesie pragmatică în favoarea utilizatorilor săi, "
 "face disponibile şi câteva pachete care nu respectă criteriile noastre de "
@@ -980,7 +1109,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -989,10 +1130,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "Multe din programele din sistem sunt licenţiate sub <emphasis>Licenţa "
 "Publică Generală</emphasis> <emphasis>GNU</emphasis>, căreia i se spune des "
@@ -1009,13 +1150,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Există alte câteva forme de texte despre drepturile de autor şi texte de "
 "licenţe folosite de programele din Debian. Puteţi găsi drepturile de autor "
@@ -1025,9 +1172,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/ru/administrivia.po b/po/ru/administrivia.po
index 6b899c71f..8d15be9ff 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-08-08 09:32+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -34,10 +34,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 ""
@@ -200,9 +205,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/ru/bookinfo.po b/po/ru/bookinfo.po
index 77562648e..e6543029e 100644
--- a/po/ru/bookinfo.po
+++ b/po/ru/bookinfo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookinfo\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2006-12-30 14:04+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -27,13 +27,19 @@ msgstr "Руководство по установке &debian-gnu;"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Данный документ содержит инструкции по установке системы &debian-gnu; "
 "&release; (<quote>&releasename;</quote>) для архитектуры &arch-title; "
@@ -43,17 +49,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/ru/boot-installer.po b/po/ru/boot-installer.po
index acc2224f7..9fb5a9fba 100644
--- a/po/ru/boot-installer.po
+++ b/po/ru/boot-installer.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-installer\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-08-08 09:41+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -112,10 +112,16 @@ msgstr "Загрузка с CD-ROM"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -149,9 +155,15 @@ msgstr ""
 #. Tag: para
 #: 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 "
+#, fuzzy, 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 "
@@ -249,10 +261,34 @@ msgstr "По сети с помощью Linux/Unix"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -351,12 +387,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, no-c-format
+#, fuzzy, 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 "
 "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> "
+"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:"
@@ -972,10 +1016,24 @@ msgstr "Экран запуска"
 
 #. Tag: para
 #: boot-installer.xml:715
-#, no-c-format
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1148,16 +1206,27 @@ msgstr "Содержимое компакт-диска"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
 msgstr ""
 "Существует три основные вариации установочных компакт-дисков Debian. Диск-"
@@ -1198,9 +1267,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1369,10 +1445,14 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:986
-#, no-c-format
+#, fuzzy, 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 "
+"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, которая выведет страницу меню "
@@ -1387,11 +1467,16 @@ msgstr "Вариант 2: Загрузка из EFI Shell"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "Если по каким-то причинам вариант 1 не сработал, перезагрузите машину и "
@@ -1474,9 +1559,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
-msgid ""
-"As with option 1, these steps start the Debian boot loader which will "
+#, fuzzy, 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 "
@@ -1649,11 +1740,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "Нажмите <command>ENTER</command>. Загрузится и запустится ядро. Ядро выведет "
 "обычные сообщения инициализации, а затем появится первый экран программы "
@@ -1824,13 +1919,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "Системный загрузчик покажет своё приглашение после получения и обработки "
 "своего файла настройки. С этого момента установка продолжится также как и "
@@ -1846,13 +1947,22 @@ msgstr "Загрузка SGI с сервера TFTP"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -2039,9 +2149,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
-msgid ""
-"OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
+#, fuzzy, 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 "
@@ -2144,7 +2260,28 @@ msgstr "Загрузка NewWorld Mac из OpenFirmware"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -2163,7 +2300,7 @@ msgid ""
 "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."
+"userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
 "Вы должны были уже скопировать файлы <filename>vmlinux</filename>, "
 "<filename>initrd.gz</filename>, <filename>yaboot</filename> и "
@@ -2781,8 +2918,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Параметры программы установки Debian"
 
 #. Tag: para
@@ -2983,9 +3121,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -3170,12 +3312,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 "Установите в <userinput>true</userinput>, чтобы включить поддержку Serial "
 "ATA RAID (также называемого ATA RAID, BIOS RAID или недо-RAID) дисков в "
@@ -3526,14 +3674,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "По умолчанию, программа установки использует протокол http для загрузки "
 "файлов с серверов-зеркал Debian, и изменить его на ftp невозможно при "
@@ -4025,10 +4180,13 @@ msgstr "Надёжность дискет"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "Надёжность дискет &mdash; это, похоже, самая большая проблема для людей, "
 "устанавливающих Debian."
@@ -4528,14 +4686,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "Если система Debian заработала, самый простой путь отправки отчёта об "
 "установке &mdash; установить пакеты <classname>installation-report</"
diff --git a/po/ru/boot-new.po b/po/ru/boot-new.po
index 66b92e09b..8d2632ddb 100644
--- a/po/ru/boot-new.po
+++ b/po/ru/boot-new.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-new\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-02-28 22:27+0300\n"
 "Last-Translator: D-R L10N Team <debian-l10n-russian@lists.debian.org>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -20,8 +20,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "Загрузка только что установленной системы Debian"
 
 #. Tag: title
@@ -54,8 +55,8 @@ 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -68,11 +69,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -86,13 +94,25 @@ 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 "
+#, fuzzy, 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 "
+"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 "
@@ -574,11 +594,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/ru/hardware.po b/po/ru/hardware.po
index a63496b70..5b5d50490 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-01 12:41+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -26,10 +26,14 @@ msgstr "Системные требования"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "Этот раздел содержит информацию о том, какое оборудование требуется для "
@@ -54,13 +58,13 @@ msgstr "Поддерживаемое оборудование"
 #| "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 architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "Debian не требует от оборудования сверх того, что требуют ядро Linux и "
 "утилиты GNU. Таким образом, любая архитектура или платформа, на которую были "
@@ -89,9 +93,12 @@ msgstr "Поддерживаемые архитектуры"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
 msgstr ""
 "Debian GNU/Linux &release; поддерживает одиннадцать основных архитектур и "
@@ -106,8 +113,9 @@ msgstr "Архитектура"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Обозначение в Debian"
 
 #. Tag: entry
@@ -463,7 +471,7 @@ msgstr "tape"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -489,9 +497,9 @@ msgstr ""
 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."
+"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>. Если вы ищете информацию по любой другой архитектуре, "
@@ -582,11 +590,16 @@ msgstr "Поддерживаются AMD64 и Intel EM64T."
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 требуется своё собственное ядро. "
@@ -596,10 +609,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "Большинство процессоров ARM могут работать с любым порядком адресации памяти "
@@ -621,14 +638,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "Линейка Intel I/O Processor (IOP) используется в продуктах, предназначенных "
 "для  хранения и обработке данных. В данный момент в Debian поддерживается "
@@ -725,10 +750,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 "Платформа Versatile эмулируется QEMU и поэтому замечательно подходит для "
 "тестирования и запуска Debian на ARM, если у вас нет такой аппаратуры."
@@ -767,24 +795,43 @@ 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>."
+#, fuzzy, 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\", "
+"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>."
 msgstr ""
 "Однако, Debian GNU/Linux &releasename; <emphasis>не</emphasis> работает на "
 "процессорах 386 и более ранних. Несмотря на то, что название архитектуры "
@@ -841,22 +888,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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, "
 "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> </"
+"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>."
+"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>."
 msgstr ""
 "Debian для &arch-title; поддерживает следующие платформы: <itemizedlist> "
 "<listitem><para> SGI IP22: включает машины SGI Indy, Indigo 2 и Challenge S. "
@@ -874,10 +936,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -900,17 +967,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"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>."
@@ -974,9 +1054,12 @@ msgstr "Варианты ядер"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
 "Есть два варианта ядер powerpc в Debian, каждый под определённый тип "
@@ -1052,12 +1135,17 @@ msgstr "Субархитектура Power Macintosh (pmac)"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "Apple (и несколько других производителей, например, Power Computing) "
 "выпускает серию компьютеров Macintosh на основе процессоров PowerPC. С целью "
@@ -1491,18 +1579,29 @@ 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>."
+#, fuzzy, 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 "
+"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>."
 msgstr ""
 "Системы NuBus на данный момент не поддерживаются Debian/powerpc. Монолитная "
 "архитектура ядра Linux/PPC не поддерживается на этих машинах. Следует "
@@ -1637,11 +1736,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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-битных субархитектур не было даже в более "
@@ -1732,11 +1835,18 @@ msgstr "Несколько процессоров"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1760,11 +1870,11 @@ msgstr ""
 #| "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 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>"
+"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 ""
 "Чтобы оптимизировать ядро для однопроцессорных систем, вам нужно заменить "
 "стандартное ядро Debian. <phrase arch=\"linux-any\">О том, как это сделать, "
@@ -1775,11 +1885,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1793,23 +1910,33 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
+"not compiled with SMP support."
 msgstr ""
 "Вариант 486 пакетов образа ядра Debian для &arch-title; собран без поддержки "
 "SMP."
 
 #. Tag: para
 #: hardware.xml:1172
-#, no-c-format
+#, fuzzy, 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."
+"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 multi-"
@@ -1830,7 +1957,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1845,14 +1972,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "На этой архитектуре поддерживается нескольких процессоров &mdash; так "
 "называемая <quote>симметричная многопроцессорная обработка (symmetric multi-"
@@ -1920,13 +2055,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, 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;."
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"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е "
@@ -2168,14 +2309,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, 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>"
+#, fuzzy, 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 "
+"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 ""
 "Иногда, нужный драйвер недоступен в виде пакета Debian. Тогда вам придётся "
 "поискать исходный код в интернете и собрать драйвер самостоятельно. Это не "
@@ -2454,9 +2602,15 @@ msgstr "Покупка аппаратного обеспечения специ�
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2640,14 +2794,21 @@ msgstr "Установочные носители"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "Этот раздел поможет определить, какие типы носителей вы можете использовать "
 "для установки Debian. Например, если на вашей машине есть дисковод гибких "
@@ -2805,10 +2966,17 @@ msgstr "Карта памяти USB"
 
 #. Tag: para
 #: hardware.xml:1767
-#, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2899,14 +3067,22 @@ msgstr "Поддерживаемые системы хранения"
 
 #. Tag: para
 #: hardware.xml:1821
-#, 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="
+#, fuzzy, 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, "
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "Загрузочные диски Debian содержат ядро, которое собрано исходя из задачи "
@@ -2921,11 +3097,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, 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 "
+#, fuzzy, 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 дисков (также "
diff --git a/po/ru/install-methods.po b/po/ru/install-methods.po
index 4d015bb4b..30358b945 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-03-04 22:03+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -33,14 +33,28 @@ 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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -66,7 +80,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -75,7 +101,7 @@ msgid ""
 "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 "
+"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."
@@ -123,16 +149,20 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, 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
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "Ближайший (и поэтому, вероятно, самый быстрый) к вам сервер-зеркало можно "
 "найти в <ulink url=\"&url-debian-mirrors;\">списке серверов-зеркал Debian</"
@@ -140,9 +170,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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 проверьте, что "
@@ -157,9 +191,15 @@ msgstr "Где искать установочные образы"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -219,10 +259,14 @@ msgstr "Файлы установки для GLAN Tank"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "Для GLAN Tank требуется, чтобы ядро и ramdisk были на том же ext2 разделе "
@@ -237,10 +281,14 @@ msgstr "Файлы установки для Kurobox Pro"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "Для Kurobox Pro требуется, чтобы ядро и ramdisk были на том же ext2 разделе "
@@ -398,12 +446,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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\"/>). "
@@ -557,10 +612,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "Эти утилиты можно найти на официальных компакт-дисках Debian CD-ROM в "
 "каталоге <filename>/tools</filename>."
@@ -573,10 +631,19 @@ 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 "
+#, fuzzy, 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 "
 "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 "
@@ -614,12 +681,17 @@ msgstr "Запись образов дисков с помощью <command>Disk
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "Если вы создаёте дискету из образа файла, который взят с официального&debian-"
 "gnu; CD, то Тип и Создатель уже установлены правильно. Следующие шаги "
@@ -995,14 +1067,23 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -1055,7 +1136,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:685
-#, no-c-format
+#, fuzzy, 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 "
@@ -1066,7 +1159,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "Так как большинство карт памяти USB продаются с единственным разделом FAT16, "
 "то вам, вероятно, не хочется переразмечать или переформатировать устройство. "
@@ -1180,10 +1273,18 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:768
-#, no-c-format
+#, fuzzy, 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 "
+"&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> "
@@ -1200,7 +1301,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1213,7 +1327,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "С большинства карт памяти USB невозможно сразу загрузиться с помощью Open "
 "Firmware, поэтому вам придётся переразметить карту памяти. На системах Mac, "
@@ -1352,12 +1466,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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>, то теперь вы должны "
 "скопировать ISO-образ Debian (businesscard, netinst или полный образ CD; "
@@ -1494,7 +1613,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1556,7 +1675,8 @@ 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:\\</filename>."
+"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"filename>."
 msgstr ""
 "Скопируйте следующие файлы из архива Debian в удобное место на жёстком "
 "диске, например, в <filename>/boot/newinstall/</filename>."
@@ -1584,14 +1704,24 @@ msgstr "Загрузка программы установки с жёстког
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1608,12 +1738,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1663,10 +1805,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1791,10 +1938,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "Некоторые старые HPPA машины (например, 715/75) используют RBOOTD, а не "
 "BOOTP. Пакет <classname>rbootd</classname> доступен в Debian."
@@ -2071,13 +2221,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2208,10 +2389,16 @@ 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 "
+#, fuzzy, 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."
@@ -2225,10 +2412,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2430,8 +2630,8 @@ msgstr "Автоматическая установка"
 #| "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 "
+"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 ""
@@ -2443,15 +2643,21 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, 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
+#, fuzzy, 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 "
+"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."
diff --git a/po/ru/installation-howto.po b/po/ru/installation-howto.po
index d33cc01eb..bab1107c7 100644
--- a/po/ru/installation-howto.po
+++ b/po/ru/installation-howto.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-howto\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-10-07 22:10+0400\n"
 "Last-Translator: D-R L10N Team <debian-l10n-russian@lists.debian.org>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -90,12 +90,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "Для некоторых методов установки требуются дополнительные образы помимо CD-"
 "образа. <phrase condition=\"unofficial-build\"> На <ulink url=\"&url-d-i;"
@@ -166,11 +171,15 @@ msgstr "Загрузка с дискет"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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</"
@@ -241,10 +250,14 @@ msgstr "Загрузка с карты памяти USB"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "Установка со съёмных USB устройств хранения также возможна. Например, из USB-"
@@ -253,14 +266,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -355,12 +377,21 @@ msgstr "Загрузка с жёсткого диска"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -474,12 +505,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "Если у вас есть разделы DOS или Windows, которые вы хотите сохранить, то "
@@ -650,10 +687,13 @@ msgstr "И напоследок&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"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"
diff --git a/po/ru/partitioning.po b/po/ru/partitioning.po
index 163e03ef8..796f17351 100644
--- a/po/ru/partitioning.po
+++ b/po/ru/partitioning.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partitioning\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-08-12 10:06+0400\n"
 "Last-Translator: D-R L10N Team <debian-l10n-russian@lists.debian.org>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -20,14 +20,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, 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"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "Дисковые разделы Debian и их размеры"
 
 #. Tag: para
@@ -125,14 +127,21 @@ msgstr "Структура каталогов"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "&debian-gnu; придерживается стандарта <ulink url=\"&url-fhs-home;"
 "\">Filesystem Hierarchy Standard</ulink> для каталогов и имён файлов. Этот "
@@ -410,15 +419,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -484,9 +506,16 @@ msgstr "Рекомендуемые схемы разметки"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -516,17 +545,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Вам может потребоваться отдельный раздел <filename>/usr/local</filename>, "
 "если вы планируете установку многих программ, которые не являются частью "
@@ -823,15 +862,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, 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 "
+#, fuzzy, 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."
@@ -848,9 +893,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -1061,14 +1111,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "Если у вас есть другие операционные системы, например, DOS или Windows и вы "
@@ -1156,12 +1214,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/ru/post-install.po b/po/ru/post-install.po
index 33ca0dbfa..128e0a11d 100644
--- a/po/ru/post-install.po
+++ b/po/ru/post-install.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: post-install\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-01-03 20:04+0300\n"
 "Last-Translator: D-R L10N Team <debian-l10n-russian@lists.debian.org>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -94,7 +94,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -102,7 +111,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "Linux &mdash; это одна из реализаций Unix. <ulink url=\"&url-ldp;\">Linux "
@@ -115,19 +124,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "Самостоятельное ориентирование в Debian"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "Debian слегка отличается от других дистрибутивов. Даже если вы знакомы с "
@@ -139,15 +156,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "Система управления пакетами Debian"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -286,13 +319,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"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</"
@@ -305,19 +346,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "<ulink url=\"http://www.debian.org/\">Веб сайт Debian</ulink> содержит "
 "огромное количество документации по Debian. В частности, посмотрите <ulink "
@@ -353,12 +408,17 @@ msgstr "Настройка почты"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "Сегодня электронная почта (email) &mdash; это очень важная часть жизни "
 "многих людей. Так как при настройке почты используется много параметров, а "
@@ -414,17 +474,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "В связи с ростом популярности систем с графическим рабочим столом, "
@@ -514,10 +585,14 @@ msgstr "Отправка почты из системы"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 настроена для "
@@ -555,13 +630,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Однако, в этом случае вам потребуется правильно настроить отдельные утилиты, "
 "чтобы они могли отправлять почту. Одной из таких утилит является "
@@ -788,11 +869,18 @@ msgstr "Сборка нового ядра"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -863,9 +951,15 @@ msgstr "Не бойтесь пересобирать ядро. Это забав
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -894,10 +988,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -950,7 +1051,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -962,7 +1076,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "Теперь вы можете выполнить конфигурацию ядра. Если установлены, настроены и "
@@ -1055,9 +1169,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/ru/preface.po b/po/ru/preface.po
index 8824b2613..975008b27 100644
--- a/po/ru/preface.po
+++ b/po/ru/preface.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preface.ru\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2005-02-20 14:47+0100\n"
 "Last-Translator: Russian L10N Team <debian-l10n-russian@lists.debian.org>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -23,13 +23,19 @@ msgstr "Установка &debian-gnu; &release; на &architecture;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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; собирает "
@@ -39,10 +45,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/ru/preparing.po b/po/ru/preparing.po
index 778ce058e..074a0516b 100644
--- a/po/ru/preparing.po
+++ b/po/ru/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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-11-05 20:43+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -26,9 +26,13 @@ msgstr "Перед установкой &debian-gnu;"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -44,11 +48,15 @@ msgstr "Обзор процесса установки"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 очень редки; наиболее часто это делается при "
@@ -70,15 +78,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -124,16 +143,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, 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
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "Найти и/или загрузить программу установки и все нужные для вашей машины "
 "специальные драйверы (пользователям компакт-дисков Debian этого делать не "
@@ -141,9 +164,12 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "Создать ленты/дискеты/USB-карты памяти или разместить загрузочные файлы "
@@ -191,8 +217,9 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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."
 
 #. Tag: para
@@ -404,10 +431,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -417,10 +449,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "Документ, который вы сейчас читаете, является разрабатываемой версией "
@@ -500,10 +536,14 @@ msgstr "Linux на &arch-title;"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "IBM Redbook описывает дистрибутивы Linux, работающие на мэйнфреймах. В нём "
@@ -1110,11 +1150,19 @@ msgstr "5 гигабайт"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1170,12 +1218,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1241,11 +1299,11 @@ 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 "
+"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."
+"very least you will need a dedicated partition for the &debian; root."
 msgstr ""
 "Если у вас уже установлена операционная система на машине <phrase arch="
 "\"x86\"> (Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, "
@@ -1305,10 +1363,15 @@ msgstr "FIXME: написать о дисках HP-UX?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1346,11 +1409,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1364,10 +1434,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "Если ваша машина содержит файловую систему FAT или NTFS, используемую DOS и "
@@ -1376,11 +1450,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1398,12 +1481,19 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:849
-#, no-c-format
+#, fuzzy, 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."
+"&debian; installation. Windows and other OS installations may destroy your "
+"ability to start &debian;, or encourage you to reformat non-native "
+"partitions."
 msgstr ""
 "Если вы хотите установить более одной операционной системы на одну машину, "
 "то вы должны установить все операционные системы перед установкой Debian. "
@@ -1422,7 +1512,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:862
-#, no-c-format
+#, fuzzy, 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, "
@@ -1430,8 +1530,8 @@ msgid ""
 "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."
+"can delete the placeholder with the &debian; partition tools later during "
+"the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 "Чтобы из OpenFirmware автоматически загружался &debian-gnu; &arch-parttype; "
 "разделы должны стоять перед остальными разделами на диске, особенно перед "
@@ -1444,11 +1544,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "Если сейчас у вас один диск с одним разделом (обычное дело для настольных "
 "компьютеров) и вы хотите запускать родную систему и Debian, то вам нужно:"
@@ -1490,18 +1594,22 @@ msgstr "Установить родную операционную систем�
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "Загрузиться в родную операционную систему и проверить, что всё хорошо, и "
 "загрузить файлы программы установки Debian."
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, 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."
 
@@ -1513,12 +1621,17 @@ msgstr "Разметка дисков из DOS или Windows"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "Если вы преобразуете существующие разделы FAT или NTFS, то рекомендуется или "
 "следование схеме, приведённой ниже или использование родных утилит Windows, "
@@ -1527,13 +1640,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1554,11 +1675,22 @@ msgstr "Переразметка без потерь при запуске из
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1578,14 +1710,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 ""
 "Перед тем как что-то сделать дальше, вы должны решить как вы разделите диск. "
 "Метод в этом разделе описывает разделение только на две части. Одна будет "
@@ -1612,17 +1751,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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> из каталога "
@@ -1685,11 +1835,17 @@ msgstr "Разметка для DOS"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1701,12 +1857,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "Очевидно, что при создании или изменении размера раздела для использования в "
 "DOS хорошей идеей будет заполнить несколько первых секторов нулями. Для "
@@ -1727,11 +1888,18 @@ msgstr "Разметка из SunOS"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1874,10 +2042,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1900,13 +2076,21 @@ msgstr "Вызов меню настройки BIOS"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "BIOS предоставляет основные функции для загрузки машины, предоставляя "
 "операционной системе доступ к оборудованию. Обычно, для настройки BIOS в "
@@ -2041,7 +2225,16 @@ msgstr "Выбор загрузочного устройства"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -2049,7 +2242,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "Многие меню настройки BIOS позволяют выбрать устройство, с которого будет "
 "загружаться система. Настройте этот параметр так, чтобы сначала операционная "
@@ -2686,17 +2879,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "Перед тем как выполнить установку, проведите планирование и некоторые "
 "предварительные шаги. IBM сделала доступной документацию о всём процессе, "
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index fda4aa3e4..d3fdca569 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-01 12:42+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -602,12 +602,26 @@ 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"
+#, fuzzy, 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 "
+"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 "
@@ -1009,14 +1023,22 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "Также возможно использовать DHCP для указания файла автоматической "
@@ -1056,13 +1078,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"automate &debian; installs should only be done with care."
 msgstr ""
 "При DHCP автоматизации лучше автоматически указывать только значения "
 "специфичные для вашей сети, например, желаемые сервера-зеркала Debian. При "
diff --git a/po/ru/random-bits.po b/po/ru/random-bits.po
index 4bcc74bf4..9f6b5e210 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-01 11:50+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -853,7 +853,16 @@ msgstr "Установка &debian-gnu; из системы Unix/Linux"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -862,7 +871,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "В этом разделе объясняется, как установить &debian-gnu; из существующей "
 "системы Unix или Linux без использования управляемой из меню программы "
@@ -876,13 +885,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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, настроенную по вашим "
 "предпочтениям, вы можете перенести ваши данные (если они есть) в неё и "
@@ -893,11 +908,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:383
-#, no-c-format
+#, fuzzy, 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 "
-"also require more knowledge of Debian and of &arch-kernel; in general than "
+"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 "
@@ -954,10 +978,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -1006,17 +1040,28 @@ msgstr "Установка <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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 ""
 "Утилита, которой пользуется программа установки Debian и которая признана "
 "официальным способом установки базовой системы Debian является "
@@ -1031,14 +1076,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1076,10 +1132,16 @@ msgstr "Запуск <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1141,13 +1203,20 @@ msgstr "Настройка базовой системы"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 "Теперь у вас есть настоящая система Debian на диске, хотя и небогатая "
 "возможностями. Выполните <command>chroot</command> в неё: "
@@ -1242,7 +1311,48 @@ msgstr "Монтирование разделов"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1269,7 +1379,7 @@ msgid ""
 "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 "
+"</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"
@@ -1637,12 +1747,17 @@ msgstr "Установка системного загрузчика"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "Чтобы сделать систему &debian-gnu; загружаемой, настройте системный "
 "загрузчик на загрузку установленного ядра с новым корневым разделом. "
@@ -1665,8 +1780,8 @@ msgstr ""
 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 "
+"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 "
@@ -1749,11 +1864,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1848,12 +1971,19 @@ msgstr "Установка &debian-gnu; через Parallel Line IP (PLIP)"
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 "Этот раздел описывает установку &debian-gnu; на компьютер без сетевой карты "
 "Ethernet, но подключённый к другому компьютеру-шлюзу с помощью нуль-"
@@ -1909,10 +2039,13 @@ msgstr "Требования"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr ""
 "Компьютер приёмник, называемый <emphasis>приёмник</emphasis>, это на который "
 "будет установлен Debian."
@@ -2350,11 +2483,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2368,11 +2508,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/ru/using-d-i.po b/po/ru/using-d-i.po
index f2c41e0d7..7f828c752 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-01 12:42+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -20,8 +20,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "Использование программы установки Debian"
 
 #. Tag: title
@@ -32,9 +33,15 @@ msgstr "Как работает программа установки"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -362,8 +369,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Ищет и монтирует компакт-диск с программой установки Debian."
 
 #. Tag: term
@@ -404,10 +412,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr ""
 "Предоставляет список серверов-зеркал Debian. Пользователь может выбрать "
 "источник, из которого будут устанавливаться пакеты."
@@ -498,12 +509,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "Позволяет пользователю разметить подключённые к системе диски, создать "
 "файловые системы на выбранных разделах и назначить им точки монтирования. "
@@ -704,11 +720,16 @@ msgstr "save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "Предоставляет пользователю возможность записать информацию на дискету, через "
 "сеть, на жёсткий диск или другой носитель в случае возникновения проблем, "
@@ -739,15 +760,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -950,11 +982,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -1148,18 +1186,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, 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
+#, fuzzy, 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."
+"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>, "
 "настанет момент, когда вам нужно будет найти и смонтировать ISO образ "
@@ -1168,7 +1212,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1179,9 +1237,9 @@ msgid ""
 "<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."
+"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> автоматически смонтирует все блочные "
 "устройства (т.е. разделы), на которых есть распознанная файловая система и "
@@ -2065,13 +2123,19 @@ msgstr "Разметка вручную"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "При ручной разметке появляется похожий экран, за исключением того, что "
 "отображается существующая таблица разделов и нет точек монтирования. Далее "
@@ -4265,13 +4329,19 @@ msgstr "Обнаружение операционных систем"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "Перед установкой системного загрузчика программа установки попытается "
 "обнаружить другие операционные системы, установленные на машине. Если она "
@@ -4433,17 +4503,22 @@ msgstr ""
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "новый раздел Debian"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"will install itself at the beginning of the new &debian; partition and it "
+"will serve as a secondary boot loader."
 msgstr ""
 "Выберите это место, если хотите использовать другой менеджер загрузки. "
 "<command>LILO</command> будет установлен в начало раздела, созданного для "
@@ -4471,13 +4546,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "Если вы не смогли загрузить Windows 9x (или DOS) после этого шага, то вам "
 "нужно воспользоваться загрузочной дискетой с Windows 9x (MS-DOS) и запустить "
@@ -4623,10 +4704,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4643,11 +4729,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
 msgstr ""
 "Это файл начальной корневой файловой системы(initial root filesystem), "
@@ -4682,12 +4774,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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 этот "
@@ -4965,9 +5062,13 @@ msgstr "Завершение установки"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -5033,11 +5134,15 @@ msgstr "Перезагрузка системы"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Вам предложат вынуть загрузочный носитель (CD, дискету, другой), который "
 "использовался для загрузки программы установки. После этого компьютер будет "
@@ -5083,11 +5188,15 @@ msgstr "Сохранение протокола установки"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "Если установка прошла успешно, файлы протокола установки, созданные во время "
 "процесса установки, будут автоматически записаны в <filename>/var/log/"
diff --git a/po/ru/welcome.po b/po/ru/welcome.po
index a88d3da76..b6c9d286f 100644
--- a/po/ru/welcome.po
+++ b/po/ru/welcome.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2009-12-25 20:24+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -21,17 +21,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "Добро пожаловать в Debian"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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;, спокойно переходите к "
@@ -385,17 +390,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, 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
+#, fuzzy, 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 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 "
+"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 "
@@ -417,9 +434,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -432,12 +454,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debian особенно популярен среди опытных пользователей из-за его технического "
 "совершенства и глубокого понимания нужд и ожиданий сообщества Linux. Debian "
@@ -446,9 +473,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -460,9 +492,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -474,11 +511,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -494,15 +540,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "Для защиты вашей системы от <quote>троянских коней</quote> и других "
 "вредоносных программ, на серверах Debian выполняется проверка, что "
@@ -515,15 +569,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Основным и самым лучшим способом получения поддержки системы Debian GNU/"
 "Linux и общения с разработчиками Debian является множество списков рассылки "
@@ -536,28 +598,42 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Что такое Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Debian GNU/Hurd &mdash; это система Debian GNU, в которой монолитное ядро "
+"Linux заменено на микроядро GNU Hurd, представляющее собой множество "
+"серверов, работающих поверх микроядра GNU Mach. Проект Hurd пока незавершён "
+"и непригоден для повседневного использования, но работа продолжается. Сейчас "
+"Hurd разработан только для архитектуры i386, однако портирование на другие "
+"архитектуры будет сделано как только система станет более стабильной."
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -570,7 +646,7 @@ msgstr ""
 #| "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 "
+"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/hurd/\"> "
@@ -579,16 +655,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "Что такое Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -618,16 +695,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; 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/\"> "
@@ -636,19 +717,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "Получение Debian"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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-"
@@ -658,9 +746,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -698,12 +790,17 @@ msgstr "Структура этого документа"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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. В нём делается несколько предположений о вашем уровне знаний. "
@@ -712,12 +809,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "Опытные пользователи в этом документе смогут найти ссылки на интересную "
 "справочную информацию, например, минимальные размеры установки, детали о "
@@ -749,12 +851,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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="
@@ -783,15 +890,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "Выполните саму установку согласно <xref linkend=\"d-i-intro\"/>. Сюда входит "
@@ -814,11 +930,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "После установки системы вы можете почитать <xref linkend=\"post-install\"/>. "
 "В ней рассказывается о том, где найти дополнительную информации о Unix и "
@@ -879,7 +999,18 @@ msgstr "Об авторских правах и лицензиях на прог
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -889,7 +1020,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Мы уверены, что вы читали некоторые лицензии, на условиях которых "
 "распространяется большинство коммерческих программ &mdash; обычно в них "
@@ -926,16 +1057,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "Заметьте, что проект Debian, уступая требованиям пользователей, сделал "
 "некоторые пакеты доступными, хотя они и не отвечают нашим критериям свободы. "
@@ -948,7 +1088,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -957,10 +1109,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "Большинство программ в системе выпущено под <emphasis>Стандартной "
 "Общественной Лицензией</emphasis> <emphasis>GNU</emphasis> , часто "
@@ -976,13 +1128,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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 доступны по нескольким соглашениям об авторских правах и "
 "программных лицензий. Сразу после установки в систему, лицензия на пакет "
@@ -991,9 +1149,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/sv/administrivia.po b/po/sv/administrivia.po
index eafac9419..3ac9f32f9 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -29,10 +29,15 @@ msgstr "Om det här dokumentet"
 
 #. 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 ""
@@ -194,9 +199,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/sv/bookinfo.po b/po/sv/bookinfo.po
index a950dc342..f50ccb4d3 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -23,13 +23,19 @@ msgstr "Installationsguide för &debian-gnu;"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Det här dokumentet innehåller installationsinstruktioner för &debian-gnu; "
 "&release; system (kodnamn <quote>&releasename;</quote>) för arkitekturen "
@@ -39,17 +45,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 ""
 "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/boot-installer.po b/po/sv/boot-installer.po
index 9a8af0071..ba1f8df9e 100644
--- a/po/sv/boot-installer.po
+++ b/po/sv/boot-installer.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-guide 20051025 boot-installer\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -104,10 +104,16 @@ msgstr "Uppstart från cd-rom"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -139,9 +145,15 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
 #: boot-installer.xml:1488 boot-installer.xml:1850
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -239,10 +251,34 @@ msgstr "Via nätverket med Linux/Unix"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -354,7 +390,7 @@ 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> "
+"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:"
@@ -949,10 +985,24 @@ msgstr "Uppstartsskärmen"
 
 #. Tag: para
 #: boot-installer.xml:715
-#, no-c-format
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1139,16 +1189,27 @@ msgstr "Cd-innehåll"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
 msgstr ""
 "Det finns tre enkla variationer av Debians installationsskivor. Cd-skivan "
@@ -1189,9 +1250,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1361,10 +1429,14 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:986
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Dessa steg startar Debians starthanterare som kommer att visa en menysida "
@@ -1379,11 +1451,16 @@ msgstr "Alternativ 2: Starta upp från EFI-skalet"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "Om, av någon anledning, alternativ 1 inte lyckas, starta om maskinen och när "
@@ -1465,9 +1542,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1644,11 +1727,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "Tryck <command>ENTER</command>. Det kommer att läsa in och starta kärnan. "
 "Kärnan kommer att visa dess vanliga initieringsmeddelanden följt av första "
@@ -1824,13 +1911,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "Starthanteraren kommer att visa sin prompt efter den har hämtat och "
 "bearbetat sin konfigurationsfil. Vid denna punkt, fortsätter installationen "
@@ -1846,13 +1939,22 @@ msgstr "Uppstart för SGI via TFTP"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -2039,9 +2141,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2142,7 +2250,28 @@ msgstr "Starta upp NewWorld Mac från OpenFirmware"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -2161,7 +2290,7 @@ msgid ""
 "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."
+"userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
 "Du har redan placerat filerna <filename>vmlinux</filename>, <filename>initrd."
 "gz</filename>, <filename>yaboot</filename> och <filename>yaboot.conf</"
@@ -2787,8 +2916,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Parametrar för Debian Installer"
 
 #. Tag: para
@@ -2990,9 +3120,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -3185,12 +3319,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 "Ställ in till <userinput>true</userinput> för att aktivera stöd för Serial "
 "ATA RAID-diskar (kallas även för ATA RAID, BIOS RAID eller fake RAID) i "
@@ -3544,14 +3684,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "Som standard använder installationsprogrammet http-protokollet för att hämta "
 "filer från Debian-speglar och ändring av det till ftp är inte möjligt under "
@@ -4049,10 +4196,13 @@ msgstr "Tillförlitlighet för disketter"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "Det största problemet för personer som använder disketter för att installera "
 "Debian verkar vara pålitligheten för disketterna."
@@ -4557,14 +4707,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "Om du har ett fungerande Debian-system är det enklaste sättet att skicka in "
 "en installationsrapport att installera paketen <classname>installation-"
diff --git a/po/sv/boot-new.po b/po/sv/boot-new.po
index e8fdef887..456bac253 100644
--- a/po/sv/boot-new.po
+++ b/po/sv/boot-new.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-new\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-08-15 22:18+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -17,8 +17,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "Starta upp ditt nya Debian-system"
 
 #. Tag: title
@@ -39,13 +40,21 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:13
-#, no-c-format
+#, fuzzy, 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><phrase "
+#| "arch=\"x86\"> or possibly the <classname>lilo</classname> bootloader</"
+#| "phrase>. 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -59,11 +68,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -78,13 +94,25 @@ 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 "
+#, fuzzy, 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 "
+"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 "
@@ -574,11 +602,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/sv/hardware.po b/po/sv/hardware.po
index fefb73a32..815fcb4fa 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -23,10 +23,14 @@ msgstr "Systemkrav"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "Det här avsnittet innehåller information om vilken maskinvara du behöver för "
@@ -51,13 +55,13 @@ msgstr "Maskinvara som stöds"
 #| "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 architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "Debian ställer inga maskinvarukrav utöver kraven ställda för Linuxkärnan och "
 "GNU:s verktyg. Därför kan alla arkitekturer eller plattformar till vilka "
@@ -86,9 +90,12 @@ msgstr "Arkitekturer som stöds"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&debian; GNU/Linux &release; supports eleven major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
 msgstr ""
 "Debian GNU/Linux &release; har stöd för elva större arkitekturer och ett "
@@ -102,8 +109,9 @@ msgstr "Arkitektur"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Debian-beteckning"
 
 #. Tag: entry
@@ -451,7 +459,7 @@ msgstr "band"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -477,9 +485,9 @@ msgstr ""
 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."
+"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 ""
 "Det här dokumentet täcker in installationen för <emphasis>&arch-title;</"
 "emphasis>-arkitekturen. Om du letar efter information om någon av de andra "
@@ -568,11 +576,16 @@ msgstr "Både AMD64 och Intel EM64T-processorer stöds."
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Varje enskild ARM-arkitektur kräver sin egna kärna. På grund av det här har "
@@ -582,10 +595,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "De flesta ARM-processorer kan köras i båda endian-lägena (big eller little). "
@@ -607,14 +624,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "Intels I/O Processor (IOP) kan hittas i ett antal produkter som relaterar "
 "till datalagring och databehandling. Debian har för närvarande stöd för "
@@ -711,10 +736,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 "Plattformen versatile emuleras av QEMU och är därför ett enkelt sätt att "
 "testa och köra Debian på ARM om du inte har maskinvaran."
@@ -752,24 +780,43 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:417
-#, no-c-format
+#, fuzzy, 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\", 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>."
+"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>."
 msgstr ""
 "Dock kan Debian GNU/Linux &releasename; <emphasis>inte</emphasis> köras på "
 "386 eller tidigare processorer. Trots arkitekturnamnet \"i386\", har stöd "
@@ -825,22 +872,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
+#, fuzzy, 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> "
+"&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> </"
+"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>."
+"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>."
 msgstr ""
 "Debian på &arch-title; har stöd för följande plattformar: <itemizedlist> "
 "<listitem><para> SGI IP22: den här plattformen inkluderar SGI-maskinerna "
@@ -859,10 +921,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -883,17 +950,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
+#, fuzzy, 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> "
+"&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 "
+"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 "
+"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>."
@@ -956,9 +1036,12 @@ msgstr "Varianter av kärnan"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr ""
 "Det finns två varianter av powerpc-kärnan i Debian, baserat på "
@@ -1035,12 +1118,17 @@ msgstr "Underarkitekturen Power Macintosh (pmac)"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "Apple (och några få andra tillverkare &mdash; Power Computing, till exempel) "
 "tillverkar en serie av Macintosh-datorer baserade på PowerPC-processorn. För "
@@ -1467,18 +1555,29 @@ msgstr "Underarkitekturen Nubus PowerMac (stöds inte)"
 
 #. Tag: para
 #: hardware.xml:952
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "NuBus-system stöds för närvarande inte av Debian/powerpc. Den monolitiska "
 "Linux/PPC-kärnarkitekturen har inte stöd för dessa maskiner; istället måste "
@@ -1611,11 +1710,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Den sista Debian-utgåvan som hade stöd för sparc32 var Etch, men bara för "
 "sun4m-system. Stöd för de andra 32-bitars underarkitekturerna har redan "
@@ -1705,11 +1808,18 @@ msgstr "Flera processorer"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1733,11 +1843,11 @@ msgstr ""
 #| "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 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>"
+"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 ""
 "För att optimera kärnan för system en en processor behöver du ersätta "
 "Debians standardkärna. <phrase arch=\"linux-any\">Du kan hitta en diskussion "
@@ -1748,11 +1858,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1766,23 +1883,33 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
+"not compiled with SMP support."
 msgstr ""
 "Varianten 486 av Debians kärnavbildningspaket för &arch-title; är inte byggt "
 "med SMP-stöd."
 
 #. Tag: para
 #: hardware.xml:1172
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Stöd för flera processorer &mdash; även kallat <quote>symmetrisk multi-"
 "processing</quote> eller SMP &mdash; finns tillgängligt för den här "
@@ -1803,7 +1930,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1818,14 +1945,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "Stöd för flera processorer &mdash; även kallat <quote>symmetrisk multi-"
 "processing</quote> eller SMP &mdash; finns tillgängligt för den här "
@@ -1895,13 +2030,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, 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;."
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"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- och PCIe-grafikkort "
@@ -2146,14 +2287,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, no-c-format
+#, fuzzy, 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 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>"
+"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 ""
 "I vissa fall finns drivrutinen du behöver inte tillgänglig som ett Debian-"
 "paket. Du kommer då att behöva leta om det finns källkod tillgänglig på "
@@ -2435,9 +2583,15 @@ msgstr "Köpa maskinvara specifikt för GNU/&arch-kernel;"
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2622,14 +2776,21 @@ msgstr "Installationsmedia"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "Det här avsnittet hjälper dig att fastställa vilka olika medietyper som du "
 "kan använda för att installera Debian. Till exempel om du har en "
@@ -2786,10 +2947,17 @@ msgstr "USB-minne"
 
 #. Tag: para
 #: hardware.xml:1767
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2880,14 +3048,22 @@ msgstr "Lagringssystem som stöds"
 
 #. Tag: para
 #: hardware.xml:1821
-#, no-c-format
+#, fuzzy, 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, which "
-"includes many drivers that won't be used for your machine<phrase arch="
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "Debians startdisketter innehåller en kärna som är byggd för att maximera "
@@ -2900,11 +3076,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Generellt sett inkluderar Debians installationssystem stöd för disketter, "
diff --git a/po/sv/install-methods.po b/po/sv/install-methods.po
index 3cb43e895..f8e61a441 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -29,14 +29,28 @@ msgstr "Officiella &debian-gnu; cd-rom-uppsättningar"
 
 #. 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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -61,7 +75,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -70,7 +96,7 @@ msgid ""
 "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 "
+"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."
@@ -119,25 +145,33 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, no-c-format
+#| msgid "Downloading Files from Debian Mirrors"
+msgid "Downloading Files from &debian; Mirrors"
 msgstr "Hämta filer från Debian-speglar"
 
 #. Tag: para
 #: install-methods.xml:85
-#, no-c-format
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "För att hitta den närmaste (och kanske även den snabbaste) spegeln, se "
 "<ulink url=\"&url-debian-mirrors;\">Hämta Debian från Internet</ulink>."
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "När filer hämtas från en Debian-spegel via FTP så bör du se till att filerna "
@@ -151,9 +185,15 @@ msgstr "Var man får tag på installationsavbildningar"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -215,10 +255,14 @@ msgstr "Installationsfiler för GLAN Tank"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "GLAN Tank kräver en kärna och ramdisk på en ext2-partition på den disk som "
@@ -233,10 +277,14 @@ msgstr "Installationsfiler för Kurobox Pro"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "Kurobox Pro kräver en kärna och ramdisk på en ext2-partition på den disk som "
@@ -394,12 +442,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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 ""
 "Innan du kan skapa disketterna behöver du först hämta ner dem från en av "
 "Debian-speglarna, som förklaras i <xref linkend=\"downloading-files\"/>. "
@@ -552,10 +607,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "De här verktygen kan hittas på de officiella Debian cd-skivorna under "
 "katalogen <filename>/tools</filename>."
@@ -568,10 +626,19 @@ msgstr "Skriva diskettavbildningar från 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 "
+#, fuzzy, 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 "
 "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 "
@@ -611,12 +678,17 @@ msgstr "Skriva diskettavbildningar med <command>Disk Copy</command>"
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "Om du skapar diskettavbildningarna från filer som från början kom från en "
 "officiell &debian-gnu;-cd, så är Type och Creator redan korrekt inställda. "
@@ -997,14 +1069,23 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -1057,7 +1138,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:685
-#, no-c-format
+#, fuzzy, 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 "
@@ -1068,7 +1161,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "Eftersom de flesta USB-minnen kommer förkonfigurerade med en enda FAT16-"
 "partition så behöver du antagligen inte partitionera eller formatera om "
@@ -1184,10 +1277,18 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:768
-#, no-c-format
+#, fuzzy, 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 "
+"&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> "
@@ -1205,7 +1306,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1218,7 +1332,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "De flesta USB-minnen kommer inte förkonfigurerade på det sätt att Open "
 "Firmware kan starta upp från dem, så därför behöver du partitionera om "
@@ -1357,12 +1471,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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 ""
 "Om du använda en <filename>hd-media</filename>-avbildning så bör du nu "
 "kopiera en Debian ISO-avbildning (visitkortsavbildning, nätinstallation "
@@ -1502,7 +1621,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1565,7 +1684,8 @@ 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:\\</filename>."
+"Copy the following files 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 "
 "hårddisk, till exempel till <filename>/boot/newinstall/</filename>."
@@ -1593,14 +1713,24 @@ msgstr "Uppstart av hårddiskinstallerare på OldWorld Mac"
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1617,12 +1747,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1672,10 +1814,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1801,10 +1948,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "Vissa äldre HPPA-maskiner (exempelvis 715/75) använder hellre RBOOTD än "
 "BOOTP. Det finns ett paket som kallas <classname>rbootd</classname> "
@@ -2081,13 +2231,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2218,10 +2399,16 @@ 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 "
+#, fuzzy, 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."
@@ -2235,10 +2422,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2445,8 +2645,8 @@ msgstr "Automatisk installation"
 #| "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 "
+"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 ""
@@ -2458,15 +2658,21 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Automatic Installation Using the Debian Installer"
+msgid "Automatic Installation Using the &debian; Installer"
 msgstr "Automatisk installation med Debian Installer"
 
 #. Tag: para
 #: install-methods.xml:1604
-#, no-c-format
+#, fuzzy, 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 "
+"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."
diff --git a/po/sv/installation-howto.po b/po/sv/installation-howto.po
index da26b3fcb..6f582936c 100644
--- a/po/sv/installation-howto.po
+++ b/po/sv/installation-howto.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-guide 20051025 installation howto\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-09-29 21:15+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -88,12 +88,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "Vissa installationsmetoder kräver andra avbildningar än cd-avbilder. <phrase "
 "condition=\"unofficial-build\"> Webbplatsen <ulink url=\"&url-d-i;\">&d-i; </"
@@ -164,11 +169,15 @@ msgstr "Diskett"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Om din dator inte kan starta upp från en cd-skiva kan du hämta "
 "diskettavbildningar för att installera Debian. Du behöver <filename>floppy/"
@@ -239,10 +248,14 @@ msgstr "USB-minne"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "Det är också möjligt att installera från en flyttbar USB-lagringsenhet. Till "
@@ -251,14 +264,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -353,12 +375,21 @@ msgstr "Uppstart från hårddisk"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -473,12 +504,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "Om du har en befintlig DOS- eller Windows-partition som du vill behålla, var "
@@ -650,10 +687,13 @@ msgstr "Och till slut&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"We hope that your &debian; installation is pleasant and that you find "
+"&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
 msgstr ""
 "Vi hoppas att din Debian-installation känns bra och att du tycker att Debian "
 "är användbar. Du kanske även vill läsa <xref linkend=\"post-install\"/>."
diff --git a/po/sv/partitioning.po b/po/sv/partitioning.po
index 59e8459d3..bbb84fbc8 100644
--- a/po/sv/partitioning.po
+++ b/po/sv/partitioning.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partitioning\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2009-11-25 17:50+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -17,14 +17,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, no-c-format
+#| msgid "Partitioning for Debian"
+msgid "Partitioning for &debian;"
 msgstr "Partitionera för Debian"
 
 #. Tag: title
 #: partitioning.xml:13
-#, no-c-format
-msgid "Deciding on Debian Partitions and Sizes"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "Bestämma Debian-partitioner och storlekar"
 
 #. Tag: para
@@ -124,14 +126,21 @@ msgstr "Katalogträdet"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "&debian-gnu; följer <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
 "Standard</ulink> för namngivning av kataloger och filer. Den här standarden "
@@ -408,15 +417,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -482,9 +504,16 @@ msgstr "Rekommenderad partitionstabell"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -515,17 +544,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Du kan behöva en separat <filename>/usr/local</filename>-partition om du "
 "planerar att installera många program som inte är en del av Debian-utgåvan. "
@@ -820,15 +859,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, no-c-format
+#| msgid "Debian Partitioning Programs"
+msgid "&debian; Partitioning Programs"
 msgstr "Debians partitioneringsprogram"
 
 #. Tag: para
 #: partitioning.xml:436
-#, no-c-format
-msgid ""
-"Several varieties of partitioning programs have been adapted by Debian "
+#, fuzzy, 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."
@@ -846,9 +891,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -1058,14 +1108,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "Om du redan har ett befintligt operativsystem såsom DOS eller Windows "
@@ -1157,12 +1215,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/sv/post-install.po b/po/sv/post-install.po
index adcbb4f60..c544d279b 100644
--- a/po/sv/post-install.po
+++ b/po/sv/post-install.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: post-install\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-01-02 01:58+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -92,7 +92,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -100,7 +109,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "Linux är en implementering av Unix. <ulink url=\"&url-ldp;\">Linux "
@@ -114,19 +123,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "Orientera dig runt i Debian"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "Debian är lite olik från övriga distributioner. Även om du känner till Linux "
@@ -138,15 +155,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "Debians paketsystem"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -284,13 +317,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"filename>. To read about &debian;-specific issues for particular programs, "
 "look at <filename>/usr/share/doc/(package name)/README.Debian</filename>."
 msgstr ""
 "Det finns också en mängd användbar dokumentation i <filename>/usr/share/doc</"
@@ -303,19 +344,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "<ulink url=\"http://www.debian.org/\">Debians webbplats</ulink> innehåller "
 "en mängd dokumentation om Debian. Se gärna <ulink url=\"http://www.debian."
@@ -351,12 +406,17 @@ msgstr "Konfigurera ditt system att använda e-post"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "Idag är e-post en viktig del av många personers liv. Eftersom det finns "
 "många alternativ för hur man gör konfigurationen, och eftersom det är "
@@ -412,17 +472,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "Med den ökande populariteten för grafiska skrivbordssystem, har användningen "
@@ -512,10 +583,14 @@ msgstr "Skicka e-post utanför systemet"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
 "Som tidigare nämnts, är det installerade Debian-systemet endast konfigurerat "
@@ -554,13 +629,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Men om så är fallet behöver du konfigurera individuella verktyg till att "
 "korrekt skicka e-post. Ett sådant verktyg är <command>reportbug</command>, "
@@ -788,11 +869,18 @@ msgstr "Bygg en ny kärna"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -864,9 +952,15 @@ msgstr "Var inte rädd att försöka bygga en kärna. Det är kul och ger mycket
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -895,10 +989,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -949,7 +1050,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -961,7 +1075,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "Nu kan du konfigurera din kärna. Kör <userinput>make xconfig</userinput> om "
@@ -1054,9 +1168,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/sv/preface.po b/po/sv/preface.po
index 1ddb40b8d..e5b03295b 100644
--- a/po/sv/preface.po
+++ b/po/sv/preface.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-guide 20051025 preface\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2006-08-19 16:42+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -23,13 +23,19 @@ msgstr "Installation av &debian-gnu; &release; för &architecture;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Vi är glada att du har valt att prova Debian och är säkra på att du kommer "
 "att tycka att utgåvan av Debian GNU/&arch-kernel; är unik. &debian-gnu; "
@@ -39,10 +45,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/sv/preparing.po b/po/sv/preparing.po
index 5f268821b..f80ed8fac 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -23,9 +23,13 @@ msgstr "Före installation av &debian-gnu;"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -42,11 +46,15 @@ msgstr "Översikt av installationsprocessen"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Först, bara som en notering angående ominstallationer. Med Debian är "
 "omständigheter som kräver en total ominstallation av ditt system mycket "
@@ -69,15 +77,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -123,25 +142,32 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, no-c-format
+#| msgid "Create partitionable space for Debian on your hard disk."
+msgid "Create partitionable space for &debian; on your hard disk."
 msgstr "Skapa partitionerbart utrymme för Debian på din hårddisk."
 
 #. Tag: para
 #: preparing.xml:73
-#, no-c-format
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "Skaffa installeringsprogramvaran och eventuella specialdrivrutiner som din "
 "maskin kräver (förutom användare med Debian-cd)."
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "Ställ in datorn för uppstart från band, disketter eller USB-minnen, eller "
@@ -186,8 +212,9 @@ msgstr "Anslut en eller flera DASD (Direct Access Storage Device)."
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 "Skapa och montera partitioner på vilka Debian kommer att installeras."
 
 #. Tag: para
@@ -400,10 +427,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -414,10 +446,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "Dokumentet du nu läser, som är en utvecklingsversion av Installationsguiden "
@@ -497,10 +533,14 @@ msgstr "Linux för &arch-title;"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "IBM Redbook beskriver Linux-utgåvor för mainframe. Den har inget kapitel om "
@@ -1099,11 +1139,19 @@ msgstr "5 gigabyte"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1160,12 +1208,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1232,11 +1290,11 @@ 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 "
+"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."
+"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, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
@@ -1297,10 +1355,15 @@ msgstr "FIXME: skriva om HP-UX-diskar?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1340,11 +1403,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1358,10 +1428,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "Om din maskin har ett FAT- eller NTFS-filsystem, som används av DOS och "
@@ -1370,11 +1444,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1392,12 +1475,19 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:849
-#, no-c-format
+#, fuzzy, 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."
+"&debian; installation. Windows and other OS installations may destroy your "
+"ability to start &debian;, or encourage you to reformat non-native "
+"partitions."
 msgstr ""
 "Om du ska att installera fler än ett operativsystem på samma maskin, bör du "
 "installera alla andra system innan du börjar med Debian-installationen. "
@@ -1417,7 +1507,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:862
-#, no-c-format
+#, fuzzy, 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, "
@@ -1425,8 +1525,8 @@ msgid ""
 "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."
+"can delete the placeholder with the &debian; partition tools later during "
+"the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 "För att OpenFirmware ska automatiskt starta upp &debian-gnu; bör &arch-"
 "parttype;-partitionerna visas före alla andra partitioner på disken, "
@@ -1440,11 +1540,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "Om du för närvarande har en hårddisk med en partition (en vanlig inställning "
 "för skrivbordsdatorer) och du vill få möjlighet att starta upp både det "
@@ -1489,18 +1593,22 @@ msgstr "Installera det ursprungliga operativsystemet på dess nya partition."
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "Starta upp det ursprungliga systemet igen för att kontrollera att allting är "
 "OK och hämta ner uppstartsfilerna för Debian Installer."
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, 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
@@ -1511,12 +1619,17 @@ msgstr "Partitionera från DOS eller Windows"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "Om du manipulerar befintliga FAT- eller NTFS-partitioner, rekommenderas det "
 "att du antingen använder planen nedan eller de verktyg som tillhör Windows "
@@ -1526,13 +1639,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1554,11 +1675,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1579,14 +1711,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 ""
 "Innan du fortsätter bör du ha bestämt dig för hur du ska dela upp disken. "
 "Metoden i det här avsnittet kommer endast att dela upp en befintlig "
@@ -1614,17 +1753,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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 ""
 "Det första som behövs är en kopia av <command>fips</command> som finns "
@@ -1688,11 +1838,17 @@ msgstr "Partitionering för DOS"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1704,12 +1860,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "Det verkar vara så att när du än skapar eller ändrar storlek på en partition "
 "för DOS-användning, är det en bra idé att fylla de första sektorerna med "
@@ -1730,11 +1891,18 @@ msgstr "Partitionering från SunOS"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1877,10 +2045,18 @@ msgstr "Inställning av maskinvara och operativsystem före installation"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1904,13 +2080,21 @@ msgstr "Starta BIOS-inställningsmenyn"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "BIOS tillhandahåller de grundläggande funktionerna som behövs för att starta "
 "upp din maskin och låta ditt operativsystem få tillgång till din maskinvara. "
@@ -2044,7 +2228,16 @@ msgstr "Val av uppstartsenhet"
 # Se på den här. Bootstrap?
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -2052,7 +2245,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "Många BIOS har en inställningsmeny som låter dig välja de enheter som ska "
 "användas för att starta systemet. Ställ in den till att leta efter ett "
@@ -2695,17 +2888,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "Innan du faktiskt genomför en installation, behöver du gå över några design- "
 "och förberedelsesteg. IBM har gjort dokumentation tillgänglig om hela "
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index 132f46606..a270defd3 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -604,12 +604,26 @@ msgstr "Auto-läget"
 
 #. 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"
+#, fuzzy, 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 "
+"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 "
@@ -1017,14 +1031,22 @@ msgstr "Använd en DHCP-server för att ange förkonfigurationsfiler"
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "Det är också möjligt att använda DHCP för att ange en förkonfigurationsfil "
@@ -1064,13 +1086,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"automate &debian; installs should only be done with care."
 msgstr ""
 "Ett bra sätt att använda förinställning via DHCP är att endast förinställa "
 "värden specifika till ditt nätverk, såsom vilken Debian-spegel som ska "
diff --git a/po/sv/random-bits.po b/po/sv/random-bits.po
index a06554de1..fe908eb5c 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -847,7 +847,16 @@ msgstr "Installera &debian-gnu; från ett Unix/Linux-system"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -856,7 +865,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "Det här avsnittet förklarar hur man installerar &debian-gnu; från ett "
 "befintligt Unix- eller Linux-system, utan att använda det menystyrda "
@@ -870,13 +879,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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 ""
 "När du har fått det nya Debian-systemet konfigurerat enligt din smak, kan du "
 "migrera din befintliga användardata (om den finns) till det, och fortsätta "
@@ -886,11 +901,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:383
-#, no-c-format
+#, fuzzy, 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 "
-"also require more knowledge of Debian and of &arch-kernel; in general than "
+"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 "
@@ -949,10 +973,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -1001,17 +1035,28 @@ msgstr "Installera <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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 ""
 "Verktyget som Debian Installer använder, som är känt som det officiella "
 "sättet att installera Debians grundsystem, är <command>debootstrap</"
@@ -1026,14 +1071,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1072,10 +1128,16 @@ msgstr "Kör <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1137,13 +1199,20 @@ msgstr "Konfigurera grundsystemet"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 "Nu är du har ett riktigt Debian-system, även om det är ganska minimalt, på "
 "disk. Kör <command>chroot</command> in i det: <informalexample><screen>\n"
@@ -1234,7 +1303,48 @@ msgstr "Montera partitioner"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1261,7 +1371,7 @@ msgid ""
 "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 "
+"</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"
@@ -1623,12 +1733,17 @@ msgstr "Ställ in starthanteraren"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "För att göra ditt &debian-gnu;-system startbart, ställ in din starthanterare "
 "att läsa in den installerade kärnan med din nya rotpartition. Observera att "
@@ -1651,8 +1766,8 @@ msgstr ""
 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 "
+"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 "
@@ -1735,11 +1850,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1834,12 +1957,19 @@ msgstr "Installera &debian-gnu; över Parallel Line IP (PLIP)"
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 "Det här avsnittet förklarar hur man installerar &debian-gnu; på en dator som "
 "saknar ett Ethernet-kort, men med en dator som fjärrgateway ansluten via en "
@@ -1895,10 +2025,13 @@ msgstr "Krav"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr ""
 "En måldator, kallad <emphasis>mål</emphasis>, där Debian kommer att "
 "installeras."
@@ -2345,11 +2478,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2363,11 +2503,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/sv/using-d-i.po b/po/sv/using-d-i.po
index c81d639e7..68fda60c0 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -17,8 +17,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "Användning av Debian Installer"
 
 #. Tag: title
@@ -29,9 +30,15 @@ msgstr "Hur installationsprogrammet fungerar"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -360,8 +367,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "Letar efter och monterar Debians installations-cd."
 
 #. Tag: term
@@ -402,10 +410,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr ""
 "Presenterar en lista av Debian-arkivets speglar. Användaren kan välja källan "
 "för sina installationspaket."
@@ -496,12 +507,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "Låter användaren partitionera hårddiskar ansluta till systemet, skapa "
 "filsystem på de valda partitionerna och ansluta dem till monteringspunkter. "
@@ -701,11 +717,16 @@ msgstr "save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "Ger ett sätt för användaren att spela in information på en diskett, nätverk, "
 "hårddisk eller andra media när problem påträffas för att senare kunna skicka "
@@ -738,15 +759,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, no-c-format
+#| msgid "Setting up Debian Installer and Hardware Configuration"
+msgid "Setting up &debian; Installer and Hardware Configuration"
 msgstr "Konfiguration av Debians installationsprogram och maskinvara"
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -965,7 +997,7 @@ msgstr ""
 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 "
+"&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 ""
@@ -1146,18 +1178,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, no-c-format
+#| msgid "Looking for the Debian Installer ISO Image"
+msgid "Looking for the &debian; Installer ISO Image"
 msgstr "Leta efter en ISO-avbildning för Debian Installer"
 
 #. Tag: para
 #: using-d-i.xml:676
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "När installation görs via metoden <emphasis>hd-media</emphasis> kommer du "
 "till en punkt där du behöver hitta och montera iso-avbildningen för Debian "
@@ -1166,7 +1204,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1177,9 +1229,9 @@ msgid ""
 "<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."
+"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 ""
 "Först monterar <command>iso-scan</command> automatiskt alla blockenheter "
 "(exempelvis partitioner) som har något känt filsystem på sig och söker "
@@ -2053,13 +2105,19 @@ msgstr "Manuell partitionering"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "En liknande skärm till den som visades ovanför kommer att visas om du väljer "
 "manuell partitionering förutom att din befintliga partitionstabell kommer "
@@ -4261,13 +4319,19 @@ msgstr "Sökning efter andra operativsystem"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "Innan en starthanterare blir installerad kommer installationsprogrammet att "
 "försöka att söka efter andra operativsystem som finns installerade på "
@@ -4429,17 +4493,22 @@ msgstr ""
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "Ny Debianpartition"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"will install itself at the beginning of the new &debian; partition and it "
+"will serve as a secondary boot loader."
 msgstr ""
 "Välj den här om du vill använda en annan starthanterare. <command>LILO</"
 "command> kommer att installera sig själv i början av den nya Debian-"
@@ -4467,13 +4536,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "Om du inte längre kan starta upp Windows 9x (eller DOS) efter det här "
 "steget, behöver du använda en startdiskett för Windows 9x (MS-DOS) och "
@@ -4620,10 +4695,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4640,11 +4720,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"standard &debian; installation it would be the file in <filename>/boot</"
 "filename> pointed to by the symbolic link <filename>/initrd.img</filename>."
 msgstr ""
 "Det här är det initiala rotfilsystemet som används för att starta upp "
@@ -4679,12 +4765,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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 ""
 "Det här är själva kärnan i komprimerad form. Det är en kopia av filen som "
 "omnämns i <filename>/etc/elilo.conf</filename>. I en standardinstallation av "
@@ -4960,9 +5051,13 @@ msgstr "Färdigställ installationen"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -5028,11 +5123,15 @@ msgstr "Starta om systemet"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Du kommer att bli uppmanad att mata ut uppstartsmediumet (cd-skiva, diskett, "
 "etc) som du använde för att starta upp installationsprogrammet med. Efter "
@@ -5078,11 +5177,15 @@ msgstr "Spara installationsloggar"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "Om installationen lyckas, kommer loggfilerna som skapas under "
 "installationsprocessen att automatiskt sparas till <filename>/var/log/"
diff --git a/po/sv/welcome.po b/po/sv/welcome.po
index 0ff62eaf7..bb7760f0e 100644
--- a/po/sv/welcome.po
+++ b/po/sv/welcome.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-guide 20051025 welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2009-11-09 07:54+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -17,17 +17,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "Välkommen till Debian"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Det här kapitlet ger en överblick av Debian-projektet och &debian-gnu;. Om "
 "du redan känner till historien bakom Debian-projektet och &debian-gnu;-"
@@ -376,17 +381,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Linux?"
+msgid "What is &debian; GNU/Linux?"
 msgstr "Vad är Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
-#, no-c-format
+#, fuzzy, 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 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 "
+"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 "
@@ -409,9 +426,14 @@ msgstr ""
 # Se över denna!
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -423,12 +445,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debian är speciellt populär bland erfarna användare för dess tekniska "
 "förträfflighet och sitt djupa engagemang för behov och förväntningar hos "
@@ -437,9 +464,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -451,9 +483,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -465,11 +502,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -485,15 +531,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "För att skydda ditt system mot <quote>trojanska hästar</quote> och annan "
 "ondsint programvara verifierar Debians servrar att uppskickade paket "
@@ -505,15 +559,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Den primära, och bästa, metoden att få support för ditt Debian GNU/Linux-"
 "system och kommunicera med Debians utvecklare är genom de många sändlistor "
@@ -526,28 +588,42 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Vad är Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Debian GNU/Hurd är ett Debian GNU-system som ersätter Linux monolitiska "
+"kärna med GNU Hurd &mdash; en uppsättning servrar som körs på toppen av GNU "
+"Mach-mikrokärnan. Hurd är fortfarande inte klar och passar inte för "
+"vardaglig användning men arbetet fortgår. Hurd är för närvarande endast i "
+"utveckling för i386-arkitekturen även om portningar till andra arkitekturer "
+"kommer att göras när systemet bli mer stabilt."
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -560,7 +636,7 @@ msgstr ""
 #| "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 "
+"kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
 "För mer information, se <ulink url=\"http://www.debian.org/ports/hurd/\"> "
@@ -569,16 +645,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "Vad är Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -608,16 +685,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 "För mer information, se <ulink url=\"http://www.debian.org/ports/hurd/\"> "
@@ -626,19 +707,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "Få tag på Debian"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "För information om hur man hämtar &debian-gnu; från Internet eller från var "
 "man kan köpa officiella Debian cd-skivor, se webbsidan <ulink url=\"&url-"
@@ -648,9 +736,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -689,12 +781,17 @@ msgstr "Organisering av det här dokumentet"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Det här dokumentet är tänkt att fungera som en handbok för nybörjare av "
 "Debian. Den försöker göra så få antaganden som möjligt om din kunskapsnivå. "
@@ -703,12 +800,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "Expertanvändare kan också hitta intressant referensinformation i det här "
 "dokumentet inklusive minimistorlek för installation, detaljer om vilken "
@@ -741,12 +843,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Säkerhetskopiering av ditt system, all nödvändig planering och "
 "maskinvarukonfigurering före du installerar Debian finns i <xref linkend="
@@ -776,15 +883,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "Genomför den aktuella installationen enligt <xref linkend=\"d-i-intro\"/>. "
@@ -808,11 +924,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "När du har fått ditt system installerat kan du läsa <xref linkend=\"post-"
 "install\"/>. Det här kapitlet förklarar var man letar för att finna mer "
@@ -872,7 +992,18 @@ msgstr "Om copyright och programvarulicenser"
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -882,7 +1013,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Vi är säkra på att du läst några av licenserna som kommer med de flesta "
 "kommersiella programvaror &mdash; de  säger normalt sett att du bara kan "
@@ -918,16 +1049,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "Debian-projektet gör som ett praktiskt tillmötesgående mot sina användare "
 "vissa paket med programvara tillgängliga, vilka inte uppfyller våra "
@@ -940,7 +1080,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -949,10 +1101,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "Många av programmen i system är licensierade under <emphasis>GNU</emphasis> "
 "<emphasis>General Public License</emphasis> och refereras ofta till som "
@@ -967,13 +1119,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Det finns ytterligare flera olika copyrightvillkor och programvarulicenser "
 "som används av programmen i Debian. Du kan hitta information om copyright "
@@ -983,9 +1141,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/tl/bookinfo.po b/po/tl/bookinfo.po
index 08b406b3e..591418136 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -25,13 +25,19 @@ msgstr "Patnubay sa Pagluklok ng &debian-gnu;"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Nilalaman nito ang mga bilin sa pagluklok ng sistemang &debian-gnu; "
 "&release;, para sa arkitekturang &arch-title; (<quote>&architecture;</"
@@ -41,17 +47,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 ""
 "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/tl/preface.po b/po/tl/preface.po
index d9addcdb9..4a662c3a0 100644
--- a/po/tl/preface.po
+++ b/po/tl/preface.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2005-11-30 04:17+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Debian Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -31,13 +31,19 @@ msgstr "Ang pagluklok ng &debian-gnu; &release; para sa &architecture;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Nagagalak kami na nagpasiya kayong subukan ang Debian, at tiyak na "
 "matatagpuan niyo na ang pamudmod na GNU/&arch-kernel; ng Debian ay kakaiba "
@@ -48,10 +54,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/tl/welcome.po b/po/tl/welcome.po
index 0212c84fe..0dedf9e71 100644
--- a/po/tl/welcome.po
+++ b/po/tl/welcome.po
@@ -7,7 +7,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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2005-12-05 11:31+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -19,17 +19,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "Maligayang pagdating sa Debian"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Nagbibigay ng malawakang tanaw ng Gawaing Debian at ng &debian-gnu; ang "
 "kabanatang ito. Kung alam na ninyo ang kasaysayan ng Gawaing Debian at "
@@ -324,16 +329,16 @@ msgstr ""
 #: welcome.xml:231
 #, fuzzy, no-c-format
 #| msgid "What is GNU/Linux?"
-msgid "What is Debian GNU/Linux?"
+msgid "What is &debian; GNU/Linux?"
 msgstr "Ano ang GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
 #, no-c-format
 msgid ""
-"The combination of Debian's philosophy and methodology and the GNU tools, "
+"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 "
+"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 "
@@ -347,7 +352,7 @@ msgstr ""
 #: welcome.xml:246
 #, no-c-format
 msgid ""
-"Debian's attention to detail allows us to produce a high-quality, stable, "
+"&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."
@@ -357,17 +362,17 @@ msgstr ""
 #: welcome.xml:253
 #, no-c-format
 msgid ""
-"Debian is especially popular among advanced users because of its technical "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
 #, no-c-format
 msgid ""
-"For example, Debian was the first Linux distribution to include a package "
+"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."
@@ -377,7 +382,7 @@ msgstr ""
 #: welcome.xml:267
 #, no-c-format
 msgid ""
-"Debian continues to be a leader in Linux development. Its development "
+"&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."
@@ -387,9 +392,9 @@ msgstr ""
 #: 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, "
+"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 "
@@ -401,53 +406,54 @@ msgstr ""
 #, 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."
+"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."
 msgstr ""
 
 #. 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."
+"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."
 msgstr ""
 
 #. Tag: title
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Ano ang Debian?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
 #, no-c-format
 msgid ""
-"This port of Debian is currently only being developed for the i386 and amd64 "
-"architectures, although ports to other architectures is possible."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -456,22 +462,23 @@ msgstr ""
 #, no-c-format
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-"kfreebsd-gnu/\"> Debian GNU/kFreeBSD ports page</ulink> and the "
+"kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
-msgstr ""
+#, fuzzy, no-c-format
+#| msgid "What is GNU/Linux?"
+msgid "What is &debian; GNU/Hurd?"
+msgstr "Ano ang GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -488,7 +495,7 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -497,14 +504,14 @@ msgstr ""
 #, 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; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
 #, no-c-format
-msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr ""
 
 #. Tag: para
@@ -512,17 +519,17 @@ msgstr ""
 #, 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."
+"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 ""
 
 #. Tag: para
 #: welcome.xml:398
 #, no-c-format
 msgid ""
-"Debian can be upgraded after installation very easily. The installation "
+"&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 ""
@@ -554,10 +561,10 @@ msgstr ""
 #: 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."
+"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 ""
 
 #. Tag: para
@@ -566,8 +573,8 @@ msgstr ""
 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 
 #. Tag: para
@@ -593,9 +600,9 @@ msgstr ""
 #, 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."
+"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 ""
 
 #. Tag: para
@@ -621,10 +628,10 @@ 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 "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 
@@ -642,7 +649,7 @@ msgstr ""
 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 
 #. Tag: para
@@ -708,7 +715,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Sigurado kami na may mga nabasa na kayong ilang mga lisensiya na kasama ng "
 "karamihan ng software na kinakalakal &mdash; kadalasan ay sinasabi nila na "
@@ -741,14 +748,14 @@ msgstr ""
 #: welcome.xml:577
 #, no-c-format
 msgid ""
-"The Debian project, as a pragmatic concession to its users, does make some "
+"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."
+"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."
 msgstr ""
 
 #. Tag: para
@@ -762,10 +769,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 
 #. Tag: para
@@ -773,17 +780,17 @@ msgstr ""
 #, 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."
+"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 ""
 
 #. Tag: para
 #: welcome.xml:620
 #, no-c-format
 msgid ""
-"For more information about licenses and how Debian determines whether "
+"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 ""
diff --git a/po/vi/administrivia.po b/po/vi/administrivia.po
index a8cebc9b5..1e8dfb7e0 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-30 15:33+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -31,10 +31,15 @@ msgstr "Về tài liệu này"
 
 #. 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 ""
@@ -198,9 +203,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/vi/bookinfo.po b/po/vi/bookinfo.po
index 2bb636656..e2bbcee1b 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2006-12-31 19:51+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -25,13 +25,19 @@ msgstr "Hướng Dẫn Cài Đặt &debian-gnu;"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Tài liệu này chứa hướng dẫn cài đặt hệ thống &debian-gnu; &release; (tên mã "
 "là <quote>&releasename;</quote>) vào kiến trúc &arch-title; "
@@ -41,17 +47,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 ""
 "Hướng dẫn cài đặt này dựa vào một sổ tay trước được tạo cho hệ thống cài đặt "
 "Debian cũ (<quote>đĩa mềm khởi động</quote>), cũng đã được cập nhật để diễn "
diff --git a/po/vi/boot-installer.po b/po/vi/boot-installer.po
index 7efd74c79..c77aaa6e3 100644
--- a/po/vi/boot-installer.po
+++ b/po/vi/boot-installer.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-installer\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-30 15:29+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -104,10 +104,16 @@ msgstr "Khởi động từ đĩa CD-ROM"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -139,9 +145,15 @@ msgstr ""
 #. Tag: para
 #: 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 "
+#, fuzzy, 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 "
@@ -236,10 +248,34 @@ msgstr "Qua mạng bằng Linux/UNIX"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -335,12 +371,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, no-c-format
+#, fuzzy, 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 "
 "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> "
+"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:"
@@ -957,10 +1001,24 @@ 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
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1134,16 +1192,27 @@ msgstr "Nội dung đĩa CD"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"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 kiểu khác nhau của đĩa CD cài đặt Debian. Đĩa CD <emphasis>Thẻ kinh "
@@ -1184,9 +1253,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1353,10 +1429,14 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:986
-#, no-c-format
+#, fuzzy, 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 "
+"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ộ tải khởi Debian mà sẽ hiển thị một trang trình "
@@ -1371,11 +1451,16 @@ msgstr "Tùy chọn 2: khởi động từ trình bao EFI"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "Nếu, vì lý do nào, tùy chọn 1 bị lỗi, bạn hãy khởi động lại máy, và khi màn "
@@ -1457,9 +1542,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
-msgid ""
-"As with option 1, these steps start the Debian boot loader which will "
+#, fuzzy, 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 "
@@ -1635,11 +1726,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "Bấm phím &enterkey;. Cú này sẽ tải và khởi chạy hạt nhân. Hạt nhân sẽ hiển "
 "thị thông điệp sở khởi thường rồi màn hình thứ nhất của tiến trình cài đặt "
@@ -1817,13 +1912,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "Bộ nạp khởi động sẽ hiển thị dấu nhắc riêng sau khi nó tải về và xử lý tập "
 "tin cấu hình riêng. Tại điểm thời này, tiến trình cài đặt theo cùng những "
@@ -1839,13 +1940,22 @@ msgstr "Khởi động SGI qua TFTP"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -2033,9 +2143,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
-msgid ""
-"OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
+#, fuzzy, 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 "
@@ -2139,7 +2255,28 @@ msgstr "Khởi động Mac kiểu mới từ OpenFirmware"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -2158,7 +2295,7 @@ msgid ""
 "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."
+"userinput> doesn't work. The &debian; installation program should start."
 msgstr ""
 "Trong <xref linkend=\"files-newworld\"/>, bạn đã để những tập tin "
 "<filename>vmlinux</filename>, <filename>initrd.gz</filename>, "
@@ -2771,8 +2908,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Tham số trình cài đặt Debian"
 
 #. Tag: para
@@ -2980,9 +3118,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -3173,12 +3315,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 "Đặt 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 "
@@ -3541,14 +3689,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "Mặc định là bộ 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 hỗ trợ việc chuyển đổi sang FTP trong tiến trình cài "
@@ -4053,10 +4208,13 @@ msgstr "Sự đáng tin cậy của đĩa mềm"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "Sự khó khăn lớn nhất khi người dùng đĩa mềm để cài đặt Debian có vẻ là sự "
 "đáng tin cậy của đĩa mềm."
@@ -4558,14 +4716,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "Nếu bạn có hệ thống Debian hoạt động được, phương pháp dễ nhất để gởi báo "
 "cáo cài đặt là cài đặt hai gói <classname>installation-report</classname> và "
diff --git a/po/vi/boot-new.po b/po/vi/boot-new.po
index c1d50b2dc..75c812360 100644
--- a/po/vi/boot-new.po
+++ b/po/vi/boot-new.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-new\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-01-28 18:33+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,8 +19,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| 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
@@ -53,8 +54,8 @@ 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -67,11 +68,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -85,13 +93,25 @@ 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 "
+#, fuzzy, 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 "
+"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 "
@@ -589,11 +609,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/vi/hardware.po b/po/vi/hardware.po
index 426851609..6ccfbf4b7 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-03-18 22:17+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -25,10 +25,14 @@ msgstr "Cần thiết hệ thống"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"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 nào cần thiết để bắt đầu sử dụng "
@@ -53,13 +57,13 @@ msgstr "Phần cứng được hỗ trợ"
 #| "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 architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "Debian không yêu cầu phần cứng đặc biệt khác với điều cần thiết cho hạt nhân "
 "Linux 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 "
@@ -89,9 +93,12 @@ msgstr "Kiến trúc được hỗ trợ"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&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à "
@@ -105,8 +112,9 @@ msgstr "Kiến trúc"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Tên Debian"
 
 #. Tag: entry
@@ -458,7 +466,7 @@ msgstr "băng"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -484,9 +492,9 @@ msgstr ""
 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."
+"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 ""
 "Tài liệu này diễn tả cách cài đặt vào kiến trúc kiểu <emphasis>&arch-title;</"
 "emphasis>. Nếu bạn tìm thông tin về kiến trúc khác do Debian hỗ trợ, xem "
@@ -576,11 +584,16 @@ msgstr "Hỗ trợ bộ xử lý kiểu cả hai AMD64 và EM64T."
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 cần thiết hạt nhân riêng. Do đó bản phát hành Debian "
@@ -590,10 +603,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "Phần lớn bộ xử lý trung tâm kiểu ARM chạy được trong chế độ về cuối (endian) "
@@ -614,14 +631,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "Mẫu Bộ Xử Lý I/O (IOP) của công ty Intel nằm trong một số sản phẩm liên quan "
 "đến việc cất giữ dữ liệu và xử lý dữ liệu. Debian hiện thời hỗ trợ nền tảng "
@@ -717,10 +742,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 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."
@@ -759,24 +787,43 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:417
-#, no-c-format
+#, fuzzy, 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\", 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>."
+"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>."
 msgstr ""
 "Tuy nhiên, Debian GNU/Linux &releasename; sẽ <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 "
@@ -833,22 +880,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
+#, fuzzy, 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> "
+"&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> </"
+"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>."
+"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>."
 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 "
@@ -867,10 +929,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -893,17 +960,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
+#, fuzzy, 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> "
+"&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 "
+"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 "
+"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>."
@@ -965,9 +1045,12 @@ msgstr "Mùi vị hạt nhân"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1043,12 +1126,17 @@ msgstr "Kiến trúc phụ Power Macintosh (pmac)"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"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. Cho mục đích "
@@ -1475,18 +1563,29 @@ msgstr "Kiến trúc PowerMac Nubus (không được hỗ trợ)"
 
 #. Tag: para
 #: hardware.xml:952
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "Hệ thống NuBus hiện thời không được hỗ trợ bởi Debian/powerpc. 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ế "
@@ -1622,11 +1721,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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, nhưng ngay cả nó "
 "chỉ hỗ trợ co hệ thống sun4m. Hỗ trợ cho các kiến trúc phụ 32-bit khác đã bị "
@@ -1716,11 +1819,18 @@ msgstr "Đa bộ xử lý"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1744,11 +1854,11 @@ msgstr ""
 #| "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 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>"
+"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 ""
 "Để tối ưu hoá hạt nhân cho hệ thống bộ xử lý trung tâm đơn, bạn sẽ cần phải "
 "thay thế hạt nhân Debian tiêu chuẩn. <phrase arch=\"linux-any\">Có một cuộc "
@@ -1759,11 +1869,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1776,23 +1893,33 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"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 được "
 "biên dịch với khả năng hỗ trợ SMP."
 
 #. Tag: para
 #: hardware.xml:1172
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "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 "
@@ -1812,7 +1939,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1827,14 +1954,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "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ằng một ảnh hạt nhân "
@@ -1902,13 +2037,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, 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;."
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. "
+"&debian; &release; ships with X.Org version &x11ver;."
 msgstr ""
 "Khả năng hỗ trợ giao diện đồ họa của Debian dựa hoàn toàn vào sự hỗ trợ cơ "
 "bản của hệ thống X11 của X.Org. Phần lớn thẻ ảnh động kiểu AGP, PCI và PCIe "
@@ -2150,14 +2291,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, no-c-format
+#, fuzzy, 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 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>"
+"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 ""
 "Trong một số trường hợp riêng, trình điều khiển cần thiết không sẵn sàng "
 "dạng gói Debian. Vì thế bạn cần phải tìm mã nguồn trên Mạng, và tự biên dịch "
@@ -2434,9 +2582,15 @@ msgstr "Mua phần cứng đặc biệt cho GNU/&arch-kernel;"
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2621,14 +2775,21 @@ msgstr "Vật chứa trình cài đặt"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "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ể "
 "được dùng để cài đặt hệ thống Debian. Chẳng hạn, nếu bạn có một ổ đĩa mềm "
@@ -2785,10 +2946,17 @@ msgstr "Thanh bộ nhớ USB"
 
 #. Tag: para
 #: hardware.xml:1767
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2878,14 +3046,22 @@ msgstr "Hệ thống cất giữ được hỗ trợ"
 
 #. Tag: para
 #: hardware.xml:1821
-#, no-c-format
+#, fuzzy, 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, which "
-"includes many drivers that won't be used for your machine<phrase arch="
+"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 "
+"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 "
@@ -2898,11 +3074,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/vi/install-methods.po b/po/vi/install-methods.po
index 7eb84c5a9..b5868d88f 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-03-18 22:45+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -31,14 +31,28 @@ msgstr "Bộ đĩa CD &debian-gnu; chính thức"
 
 #. 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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -63,7 +77,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -72,7 +98,7 @@ msgid ""
 "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 "
+"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."
@@ -121,25 +147,33 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, no-c-format
+#| msgid "Downloading Files from Debian Mirrors"
+msgid "Downloading Files from &debian; Mirrors"
 msgstr "Tải tập tin xuống nhân bản Debian"
 
 #. Tag: para
 #: install-methods.xml:85
-#, no-c-format
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "Để tìm máy nhân bản gần nhất (do đó rất có thể là nhanh nhất), xem <ulink "
 "url=\"&url-debian-mirrors;\">danh sách nhân bản Debian</ulink>."
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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 dùng FTP, hãy kiểm tra xem bạn "
@@ -154,9 +188,15 @@ msgstr "Nơi tìm ảnh cài đặt"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -215,10 +255,14 @@ msgstr "Tập tin cài đặt GLAN Tank"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "GLAN Tank cần thiết một hạt nhân và đĩa RAM trên một phân vùng ext2 trên đĩa "
@@ -233,10 +277,14 @@ msgstr "Tập tin cài đặt Kurobox Pro"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "Kurobox Pro cần thiết một hạt nhân và đĩa RAM trên một phân vùng ext2 trên "
@@ -394,12 +442,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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 ""
 "Trước khi bạn có thể tạo đĩa mềm, bạn cần phải tải các tập tin xuống một của "
 "những máy nhân bản Debian, như được diễn tả trong phần <xref linkend="
@@ -552,10 +607,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 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ụ)."
@@ -568,10 +626,19 @@ msgstr "Ghi ảnh đĩa từ 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 "
+#, fuzzy, 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 "
 "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 "
@@ -612,12 +679,17 @@ msgstr "Ghi ảnh đĩa bằng <command>Disk Copy</command>"
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "Nếu bạn đang tạo ảnh đĩa mềm từ các tập tin đã có trên đĩa CD &debian-gnu; "
 "chính thức, trong trường hợp đó cả hai tài sản Type (kiểu) và Creator (bộ "
@@ -995,14 +1067,23 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -1054,7 +1135,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:685
-#, no-c-format
+#, fuzzy, 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 "
@@ -1065,7 +1158,7 @@ msgid ""
 "# 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."
+"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 đó. "
@@ -1178,10 +1271,18 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:768
-#, no-c-format
+#, fuzzy, 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 "
+"&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> "
@@ -1199,7 +1300,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1212,7 +1326,7 @@ msgid ""
 "$ 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."
+"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 đó. Trên hệ thống Mac, chạy "
@@ -1353,12 +1467,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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ây giờ bạn cần "
 "phải sao chép vào thanh USB một ảnh ISO Debian (danh thiếp [businesscard], "
@@ -1500,7 +1619,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1563,7 +1682,8 @@ 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:\\</filename>."
+"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"filename>."
 msgstr ""
 "Hãy sao chép những tập tin theo đây từ kho Debian vào một vị trí tiện trên "
 "đĩa cứng, v.d. vào <filename>/boot/newinstall/</filename>."
@@ -1591,14 +1711,24 @@ 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
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1616,12 +1746,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1671,10 +1813,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1804,10 +1951,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "Một số máy HPPA cũ hơn (v.d. 715/75) dùng RBOOTD hơn là BOOTP. Debian có sẵn "
 "một gói <classname>rbootd</classname>."
@@ -2101,13 +2251,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2243,10 +2424,16 @@ 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 "
+#, fuzzy, 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."
@@ -2260,10 +2447,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2469,8 +2669,8 @@ msgstr "Cài đặt tự động"
 #| "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 "
+"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 ""
@@ -2482,15 +2682,21 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Automatic Installation Using the Debian Installer"
+msgid "Automatic Installation Using the &debian; Installer"
 msgstr "Cài đặt tự động bằng trình cài đặt Debian"
 
 #. Tag: para
 #: install-methods.xml:1604
-#, no-c-format
+#, fuzzy, 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 "
+"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."
diff --git a/po/vi/installation-howto.po b/po/vi/installation-howto.po
index 012641cbc..e887634eb 100644
--- a/po/vi/installation-howto.po
+++ b/po/vi/installation-howto.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-howto\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2009-02-12 18:33+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com\n"
@@ -89,12 +89,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "Một số phương pháp cài đặt riêng cần thiết ảnh kiểu khác với ảnh đĩa CD. "
 "<phrase condition=\"unofficial-build\"> <ulink url=\"&url-d-i;\">Trang chủ "
@@ -163,11 +168,15 @@ msgstr "Đĩa mềm"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Nếu bạn không có khả năng khởi động từ đĩa CD, 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</"
@@ -238,10 +247,14 @@ msgstr "Thanh bộ nhớ USB"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"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. Thí dụ, một dây khoá USB có "
@@ -249,14 +262,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -354,12 +376,21 @@ msgstr "Khởi động từ đĩa cứng"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -471,12 +502,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "Nếu bạn có một phân vùng thêm kiểu DOS hay Windows mà bạn muốn bảo tồn, hãy "
@@ -644,10 +681,13 @@ msgstr "Vậy cuối cùng&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"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\"/"
diff --git a/po/vi/partitioning.po b/po/vi/partitioning.po
index 7b58d92ef..ba02f6bd1 100644
--- a/po/vi/partitioning.po
+++ b/po/vi/partitioning.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partitioning\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2008-01-28 19:05+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,14 +19,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, no-c-format
+#| msgid "Partitioning for Debian"
+msgid "Partitioning for &debian;"
 msgstr "Phân vùng cho Debian"
 
 #. Tag: title
 #: partitioning.xml:13
-#, no-c-format
-msgid "Deciding on Debian Partitions and Sizes"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "Chọn phân vùng Debian, đặt kích cỡ phân vùng"
 
 #. Tag: para
@@ -123,14 +125,21 @@ msgstr "Cây thư mục"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "&debian-gnu; tùy theo <ulink url=\"&url-fhs-home;\">Tiêu Chuẩn Phân Cấp Hệ "
 "Thống Tập Tin</ulink> khi đặt tên của tập tin và thư mục. Tiêu chuẩn này cho "
@@ -406,15 +415,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -479,9 +501,16 @@ msgstr "Bố trí phân vùng khuyến khích"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -512,17 +541,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Có lẽ bạn cần có 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 "
@@ -814,15 +853,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, no-c-format
+#| 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
-msgid ""
-"Several varieties of partitioning programs have been adapted by Debian "
+#, fuzzy, 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."
@@ -841,9 +886,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -1062,14 +1112,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "Nếu bạn có hệ điều hành khác đã có, v.d. DOS, Windows hay Mac OSX, và bạn "
@@ -1159,12 +1217,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/vi/post-install.po b/po/vi/post-install.po
index a702ebd5e..f962755ee 100644
--- a/po/vi/post-install.po
+++ b/po/vi/post-install.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: post-install\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2007-01-15 17:27+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -96,7 +96,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -104,7 +113,7 @@ msgid ""
 "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 "
+"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="
@@ -118,19 +127,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| 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
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "Debian khác một ít với những bản phát hành khác. Thậm chí nếu bạn quen với "
@@ -141,15 +158,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| 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
+#, fuzzy, 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 "
+"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>) </"
@@ -292,13 +325,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"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/"
@@ -311,19 +352,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "<ulink url=\"http://www.debian.org/\">Nơi Mạng 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/"
@@ -360,12 +415,17 @@ msgstr "Thiết lập thư điện tử trên hệ thống"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "Thư điện tử là việc hàng ngày cho rất nhiều người trên khắp thế giới. Vì có "
 "nhiều tùy chọn thiết lập, và thiết lập đúng có tác động một số tiện ích "
@@ -421,17 +481,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "Tuy nhiên, rất nhiều người hiện thời thích sử dụng chương trình đồ họa hơn "
@@ -519,10 +590,14 @@ msgstr "Gửi thư ra hệ thống"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -559,13 +634,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Tuy nhiên, trong trường hợp đó, bạn có thể cần phải cần cấu hình tiện ích "
 "riêng để gửi đúng thư điện tử. Một tiện ích như vậy là <command>reportbug</"
@@ -788,11 +869,18 @@ msgstr "Biên dịch hạt nhân mới"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -863,9 +951,15 @@ msgstr "Đừng sợ thử biên dịch hạt nhân: kinh nghiệm này là thú
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -894,10 +988,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -950,7 +1051,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -962,7 +1076,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "Lúc đó bạn có khả năng cấu hình hạt nhân mới. Nếu bạn đã cài đặt và cấu hình "
@@ -1053,9 +1167,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/vi/preface.po b/po/vi/preface.po
index 0986e446c..a48f055c8 100644
--- a/po/vi/preface.po
+++ b/po/vi/preface.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preface\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2006-08-01 21:04+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -25,13 +25,19 @@ msgstr "Cài đặt &release; &debian-gnu; trên &architecture;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "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 chắc chắn là bạn sẽ tìm thấy bản phát hành GNU/&arch-kernel; của Debian "
@@ -41,10 +47,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/vi/preparing.po b/po/vi/preparing.po
index 8e07d8e28..809eec664 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2009-02-12 18:43+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -25,9 +25,13 @@ msgstr "Trước khi cài đặt &debian-gnu;"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -43,11 +47,15 @@ msgstr "Toàn cảnh tiến trình cài đặt"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 cần thiết cài đặt lại toàn bộ hệ thống; v.d. nếu cơ chế đĩa "
@@ -69,15 +77,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -123,16 +142,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, no-c-format
+#| 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 dành cho Debian."
 
 #. Tag: para
 #: preparing.xml:73
-#, no-c-format
+#, fuzzy, 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)."
+"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 cần thiết bởi máy của bạn (người dùng đĩa CD Debian nên bỏ qua bước "
@@ -140,9 +163,12 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"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/đĩa mềm/thanh USB khởi động, hoặc để tập tin khởi động (hậu "
@@ -187,8 +213,9 @@ msgstr "Gắn một hay nhiều DASD (thiết bị cất giữ truy cập trực
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 "Tạo và gắn kết những phân vùng nơi Debian sẽ được cài đặt."
 
 #. Tag: para
@@ -395,10 +422,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -408,10 +440,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 "Tài liệu này, phiên bản phát triển của Sổ Tay Cài Đặt bản phát hành Debian "
@@ -490,10 +526,14 @@ msgstr "Chạy Linux trên &arch-title;"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1092,11 +1132,19 @@ msgstr "5 GB"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1150,12 +1198,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1221,11 +1279,11 @@ 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 "
+"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."
+"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=\"x86\"> (Windows "
 "9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> "
@@ -1284,10 +1342,15 @@ msgstr "FIXME: (chưa ghi đoạn tiếng Anh)"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1326,11 +1389,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1344,10 +1414,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1357,11 +1431,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1378,12 +1461,19 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:849
-#, no-c-format
+#, fuzzy, 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."
+"&debian; installation. Windows and other OS installations may destroy your "
+"ability to start &debian;, or encourage you to reformat non-native "
+"partitions."
 msgstr ""
 "Nếu bạn định cài đặt nhiều hệ điều hành vào cùng một máy, bạn nên cài đặt "
 "các HĐH khác trước khi cài đặt Debian. Thứ tự cài đặt này ngăn cản HĐH khác "
@@ -1419,8 +1509,8 @@ msgid ""
 "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."
+"can delete the placeholder with the &debian; partition tools later during "
+"the actual install, and replace it with &arch-parttype; partitions."
 msgstr ""
 "Để OpenFirmware khởi động tự động &debian-gnu;, các phân vùng &arch-"
 "parttype; nên nằm trước các phân vùng HĐH khác trên đĩa, đặc biệt là phân "
@@ -1433,11 +1523,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"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 (thiết lập "
 "thường trên máy tính để bàn), và bạn muốn « đa khởi động » cả hệ điều hành "
@@ -1481,18 +1575,22 @@ msgstr "Cài đặt hệ điều hành gốc vào phân vùng mới của nó."
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "Khởi động về HĐH đó để thẩ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."
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, fuzzy, no-c-format
+#| msgid "Boot the Debian installer to continue installing Debian."
+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."
 
 #. Tag: title
@@ -1503,12 +1601,17 @@ msgstr "Phân vùng từ DOS hay Windows"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "Nếu bạn đang thao tác phân vùng kiểu FAT hay NTFS đã có, khuyên bạn sử dụng "
 "lược đồ bên dưới, hoặc sử dụng công cụ Windows hay DOS sở hữu. Nếu không, "
@@ -1517,13 +1620,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1543,11 +1654,22 @@ msgstr "Phân vùng lại không mất gì khi bắt đầu từ DOS, Win-32 hay
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1568,14 +1690,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 ""
 "Trước khi tiếp tục, bạn nên đã quyết định 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 "
@@ -1601,17 +1730,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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 ""
 "Trước tiên cần thiết một bản sao của tiện ích <command>fips</command> mà có "
@@ -1675,11 +1815,17 @@ msgstr "Phân vùng cho DOS"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1691,12 +1837,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "Có vẻ khi nào bạn tạo hoặc thay đổi kích cỡ của phân vùng cho DOS dùng, ý "
 "kiến tốt là tô đầy vài rãnh ghi đầu bằng số không. Bạn nên việc này trước "
@@ -1718,11 +1869,18 @@ msgstr "Phân vùng từ SunOS"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1865,10 +2023,18 @@ msgstr "Phần cứng cài đặt sẵn và thiết lập hệ điều hành"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1891,13 +2057,21 @@ msgstr "Gọi trình đơn thiết lập BIOS"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "BIOS (hệ thống nhập/xuất 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 hệ điều hành khả năng truy cập phần cứng. Hệ điều hành "
@@ -2030,7 +2204,16 @@ msgstr "Chọn thiết bị khởi động"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -2038,7 +2221,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "Nhiều trình đơn thiết lập BIOS cho bạn khả năng chọn thiết bị cần dùng để "
 "tải và khởi động hệ điều hành. Hãy đặt nó tìm một hệ điều hành có khả năng "
@@ -2679,17 +2862,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "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ộ "
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index 3dcde9dda..21e79a66d 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-01 09:36+0200\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -603,12 +603,26 @@ msgstr "Chế độ tự động"
 
 #. 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"
+#, fuzzy, 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 "
+"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 "
@@ -1011,14 +1025,22 @@ msgstr "Dùng máy phục vụ DHCP để xác định tập tin định cấu h
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "Cũng có khả năng dùng dịch vụ DHCP để xác định tập tin cấu hình sẵn cần tải "
@@ -1058,13 +1080,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"automate &debian; installs should only be done with care."
 msgstr ""
 "Một phương pháp tốt để dùng khả 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, "
diff --git a/po/vi/random-bits.po b/po/vi/random-bits.po
index ac80c7468..b05143835 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-26 17:24+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -848,7 +848,16 @@ msgstr "Cài đặt &debian-gnu; từ hệ thống UNIX/Linux"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -857,7 +866,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "Phần này diễn tả phương pháp cài đặt &debian-gnu; từ một hệ thống UNIX hay "
 "Linux đã có, không cần dùng trình cài đặt dựa vào trình đơn như được diễn tả "
@@ -870,13 +879,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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 ""
 "Một khi bạn cấu hình hệ thống Debian mới một cách thích hợp, bạn có khả năng "
 "nâng cấp các dữ liệu người dùng tồn tại (nếu có) lên nó, rồi tiếp tục làm "
@@ -887,11 +902,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:383
-#, no-c-format
+#, fuzzy, 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 "
-"also require more knowledge of Debian and of &arch-kernel; in general than "
+"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 "
@@ -947,10 +971,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -1000,17 +1034,28 @@ msgstr "Cài đặt <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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 ""
 "Tiện ích được dùng bởi trình cài đặt Debian, cũng được chấp nhận như là "
 "phương pháp chính thức để cài đặt hệ thống cơ bản Debian, là "
@@ -1025,14 +1070,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1072,10 +1128,16 @@ msgstr "Chạy <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1138,13 +1200,20 @@ msgstr "Cấu hình hệ thống cơ bản"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 "Lúc bây giờ bạn có 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"
@@ -1236,7 +1305,48 @@ msgstr "Gắn kết phân vùng"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1263,7 +1373,7 @@ msgid ""
 "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 "
+"</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"
@@ -1627,12 +1737,17 @@ msgstr "Thiết lập bộ nạp khởi động"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "Để làm cho hệ thống &debian-gnu; có khả năng khởi động, bạn hãy thiết lập bộ "
 "tải khởi động để tải hạt nhân đã cài đặt cùng với phân vùng gốc mới. Ghi chú "
@@ -1655,8 +1770,8 @@ msgstr ""
 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 "
+"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 "
@@ -1741,11 +1856,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1844,12 +1967,19 @@ msgstr "Cài đặt &debian-gnu; qua IP đường song song (PLIP)"
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 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ộ "
@@ -1906,10 +2036,13 @@ msgstr "Nhu cầu"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr ""
 "Máy tính đích, được gọi như là <emphasis>target</emphasis> (đích), vào đó "
 "Debian sẽ được cài đặt."
@@ -2347,11 +2480,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2365,11 +2505,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/vi/using-d-i.po b/po/vi/using-d-i.po
index c6f7005e0..ae1e364cf 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-13 13:42+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,8 +19,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "Sử dụng trình cài đặt Debian"
 
 #. Tag: title
@@ -31,9 +32,15 @@ msgstr "Trình cài đặt hoạt động như thế nào"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -366,8 +373,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| 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
@@ -410,10 +418,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"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ậy người dùng có "
 "thể chọn nguồn của các gói cài đặt."
@@ -509,12 +520,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "Thành phần này cho người dùng khả nă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 chúng "
@@ -727,11 +743,16 @@ msgstr "save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 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 "
@@ -762,15 +783,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, no-c-format
+#| 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
-msgid ""
-"Let's assume the Debian Installer has booted and you are facing its first "
+#, fuzzy, 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 "
 "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 "
@@ -966,11 +998,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -1167,18 +1205,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, no-c-format
+#| 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
+#, fuzzy, 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."
+"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 ""
 "Trong tiến trình cài đặt bằng phương pháp <emphasis>hd-media</emphasis>, có "
 "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, "
@@ -1187,7 +1231,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1198,9 +1256,9 @@ msgid ""
 "<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."
+"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 ""
 "Trước tiên, thành phần <command>iso-scan</command> gắn kết tự động mọi thiết "
 "bị khối tin (v.d. phân vùng) chứa hệ thống tập tin đã biết, rồi tìm kiếm "
@@ -2089,13 +2147,19 @@ msgstr "Phân vùng bằng tay"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"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 điều được hiển thị đúng trên đây sẽ được hiển thị "
 "nếu bạn chọn tự phân vùng, trừ là bảng phân vùng đã có sẽ được diễn tả, "
@@ -4258,13 +4322,19 @@ msgstr "Phát hiện hệ điều hành khác"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "Trước khi tải bộ nạp khởi động, trình cài đặt sẽ cố gắng thăm dò hệ điều "
 "hành khác đã được cài đặt trên máy tính này. Nếu nó tìm được hệ điều hành "
@@ -4422,17 +4492,22 @@ msgstr ""
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| 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
+#, fuzzy, 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."
+"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 điều này nếu bạn muốn sử dụng bộ nạp khởi động khác. <command>LILO</"
 "command> sẽ cài đặt chính nó tại đầu của phân vùng Debian mới, và sẽ làm "
@@ -4460,13 +4535,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "Không còn có thể khởi động lại vào Windows 9x (hay DOS) sau bước này thì bạn "
 "sẽ cần phải sử dụng đĩa khởi động Windows 9x (MS-DOS), và chạy lệnh "
@@ -4614,10 +4695,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4635,11 +4721,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"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 "
@@ -4676,12 +4768,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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 "
@@ -4955,9 +5052,13 @@ msgstr "Cài đặt xong"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -5022,11 +5123,15 @@ msgstr "Khởi động lại hệ thống"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "Bạn sẽ được nhắc gỡ bỏ vật chứa khởi động (đĩa CD, đĩa mềm v.v.) được dùng "
 "để khởi động trình cài đặt. Sau đó, hệ thống sẽ được khởi động lại vào hệ "
@@ -5072,11 +5177,15 @@ msgstr "Lưu bản ghi cài đặt"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "Nếu việc cài đặt là thành công, các tập tin bản ghi đượ tạo trong tiến trình "
 "cài đặt sẽ được lưu tự động vào thư mục <filename>/var/log/installer/</"
diff --git a/po/vi/welcome.po b/po/vi/welcome.po
index 6b6322165..8a18515bd 100644
--- a/po/vi/welcome.po
+++ b/po/vi/welcome.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-03-19 13:33+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,17 +19,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| 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
+#, fuzzy, 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."
+"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 "
@@ -369,17 +374,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, no-c-format
+#| 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
+#, fuzzy, 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 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 "
+"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 "
@@ -400,9 +417,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -414,12 +436,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 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. "
@@ -427,9 +454,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -440,9 +472,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -453,11 +490,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -472,15 +518,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 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 "
@@ -491,15 +545,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 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 "
@@ -513,28 +575,42 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Debian GNU/Hurd là gì vậy?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Debian GNU/Hurd là một hệ thống kiểu GNU thay thế hạt nhân lớn riêng Linux "
+"bằng điều Hurd của GNU &mdash; một bộ trình phục vụ có chạy bên trên vi hạt "
+"nhân Mach của GNU. Hurd vẫn chưa hoàn toàn, hiện thời không thích hợp để sử "
+"dụng hàng ngày, nhưng vẫn còn đang cấu tạo nó. Hurd hiện thời đang được phát "
+"triển chỉ cho kiến trúc i386, dù nó sẽ được chuyển sang những kiến trúc khác "
+"một khi hệ thống ổn định hơn."
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -547,7 +623,7 @@ msgstr ""
 #| "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 "
+"kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
 "Để tìm thông tin thêm, xem trang bản chuyển Debian GNU/Hurd <ulink url="
@@ -556,16 +632,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| 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
 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."
+"&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 ""
 
 #. Tag: para
@@ -595,16 +672,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 "Để tìm thông tin thêm, xem trang bản chuyển Debian GNU/Hurd <ulink url="
@@ -613,19 +694,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "Lấy Debian"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Để tìm thông tin về cách tải &debian-gnu; xuống Mạng 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-"
@@ -636,9 +724,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -677,12 +769,17 @@ msgstr "Cấu trúc của tài liệu này"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Tài liệu này được thiết kế nhằm sổ tay cho người dùng bắt đầu chạy Debian. "
 "Nó cố gắng giả sử càng ít càng có thể về lớp kỹ năng của bạn. Tuy nhiên, "
@@ -691,12 +788,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"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 kích cỡ cài đặt tối thiểu, và chi tiết về phần cứng được hỗ trợ bởi "
@@ -728,12 +830,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Lưu trữ hệ thống, thực hiện việc định và cấu hình phần cứng nào cần thiết "
 "trước khi cài đặt Debian, trong <xref linkend=\"preparing\"/>. Nếu bạn chuẩn "
@@ -763,15 +870,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "Thực hiện việc cài đặt thật tùy theo <xref linkend=\"d-i-intro\"/>. Tiến "
@@ -793,11 +909,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"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 "
@@ -857,7 +977,18 @@ msgstr "Về tác quyền và giấy phép phần mềm"
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -867,7 +998,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Chắc chắn là bạn đã đọc một số giấy phép được phát hành cùng với hậu hết "
 "phần mềm buôn bán &mdash; chúng thường nói là bạn có quyền dùng chỉ một bản "
@@ -901,16 +1032,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "Dự án Debian, để giúp đỡ người dùng, có phải làm cho công bố một số gói "
 "không thỏa tiêu chuẩn tự do của chúng tôi. Tuy nhiên, những gói này không "
@@ -923,7 +1063,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -932,10 +1084,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "Nhiều chương trình của hệ thống được phát hành với điều kiện của "
 "<emphasis>Giấy Phép Công Cộng GNU</emphasis>, thường được gọi đơn giản là "
@@ -952,13 +1104,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "Có vài kiểu khác 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 "
@@ -968,9 +1126,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/zh_CN/administrivia.po b/po/zh_CN/administrivia.po
index c41d0d245..5b9f0837f 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-01 16:35+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -26,10 +26,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 ""
@@ -180,9 +185,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/zh_CN/bookinfo.po b/po/zh_CN/bookinfo.po
index a03c2ed29..784d7686c 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-07 11:55+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -20,13 +20,19 @@ msgstr "&debian-gnu; 安装手册"
 
 #. Tag: para
 #: bookinfo.xml:8
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "本文是 &debian-gnu; &release; 系统(代号 <quote>&releasename;</quote>)在 "
 "&arch-title; (<quote>&architecture;</quote>) 硬件架构下的安装教程。还包括关于"
@@ -34,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 ""
 "本安装指南是基于一份为旧版 Debian 安装系统(<quote>boot-floppies</quote>) 而撰"
 "写的手册，并针对新的 Debian 安装系统进行了增补和修订。但是，对于 "
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 7d8d27641..b9e52500c 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-01 16:50+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -96,10 +96,16 @@ msgstr "从 CD 光盘上引导"
 #. Tag: para
 #: 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, "
+#, fuzzy, 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."
@@ -129,9 +135,15 @@ msgstr ""
 #. Tag: para
 #: 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 "
+#, fuzzy, 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 "
@@ -220,10 +232,34 @@ msgstr "通过网络使用 Linux/Unix"
 
 #. Tag: para
 #: boot-installer.xml:150
-#, no-c-format
+#, fuzzy, 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. "
+"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> "
@@ -308,12 +344,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:245
-#, no-c-format
+#, fuzzy, 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 "
 "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> "
+"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:"
@@ -894,10 +938,24 @@ msgstr "引导界面"
 
 #. Tag: para
 #: boot-installer.xml:715
-#, no-c-format
+#, fuzzy, 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"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -1053,16 +1111,27 @@ msgstr "CD 的内容"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"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)</"
@@ -1097,9 +1166,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1247,10 +1323,14 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:986
-#, no-c-format
+#, fuzzy, 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 "
+"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 引导器会显示一个菜单页用于选择启动内核和选项。进入选择"
@@ -1264,11 +1344,16 @@ msgstr "选项 2: 从 EFI Shell 启动"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "某些情况下，选项 1 无法成功，重新启动机器然后在 EFI Boot Manager 画面出现的时"
@@ -1342,9 +1427,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
-msgid ""
-"As with option 1, these steps start the Debian boot loader which will "
+#, fuzzy, 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 "
@@ -1496,11 +1587,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "按下 <command>ENTER</command>。会加载并启动内核。内核在 Debian 安装程序的第一"
 "个屏幕显示常规的初始化信息。"
@@ -1660,13 +1755,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "在下载并且处理配置文件后，引导装载程序将显示它的提示符。从这里开始，安装过程"
 "将和 CD 安装是 同样的过程。在内核已经完成从网络的自我安装后选择一个像上面提到"
@@ -1681,13 +1782,22 @@ msgstr "SGI TFTP 引导"
 
 #. Tag: para
 #: boot-installer.xml:1319
-#, no-c-format
+#, fuzzy, 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"
 "</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 "
+"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."
@@ -1861,9 +1971,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
-msgid ""
-"OldWorld PowerMacs will not boot a Debian CD, because OldWorld computers "
+#, fuzzy, 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 "
@@ -1959,7 +2075,28 @@ msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
 
 #. Tag: para
 #: boot-installer.xml:1588
-#, no-c-format
+#, fuzzy, 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 "
@@ -1978,7 +2115,7 @@ msgid ""
 "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."
+"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 分区的"
@@ -2539,8 +2676,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Debian 安装程序的参数"
 
 #. Tag: para
@@ -2727,9 +2865,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -2899,12 +3041,18 @@ msgstr "disk-detect/dmraid/enable (dmraid)"
 
 #. Tag: para
 #: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, 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>."
+"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) 磁盘的支持。注意，这种支持当前是实验性"
@@ -3233,14 +3381,21 @@ msgstr "mirror/protocol (protocol)"
 
 #. Tag: para
 #: boot-installer.xml:2525
-#, no-c-format
+#, fuzzy, 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 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."
+"&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."
 msgstr ""
 "默认情况下，安装程序会使用 http 协议从 Debian 镜像下载文件，在普通优先级下不"
 "能修改协议为 ftp。设置该参数为 <userinput>ftp</userinput>，您可以迫使安装程序"
@@ -3689,10 +3844,13 @@ msgstr "软盘的可靠性"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "对于用软盘安装 Debian 的人来说，他们遇到的最大的问题很可能是软盘的可靠性。"
 
@@ -4144,14 +4302,23 @@ 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>."
+#, fuzzy, 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</"
+"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>."
 msgstr ""
 "如果您有一个可以运转的 Debian 系统，发送安装报告最简单的方法是安装 "
 "<classname>installation-report</classname> 和 <classname>reportbug</"
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index 5659cf6ff..8e8f5951e 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:19+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -14,8 +14,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "启动进入新 Debian 系统"
 
 #. Tag: title
@@ -48,8 +49,8 @@ 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -60,11 +61,18 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:23
-#, no-c-format
+#, fuzzy, 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 "
-"problem that is preventing the system from booting Debian. In most cases "
+"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\"/>)."
@@ -75,13 +83,25 @@ 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 "
+#, fuzzy, 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 "
+"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 "
@@ -523,11 +543,20 @@ msgstr ""
 
 #. Tag: para
 #: boot-new.xml:321
-#, no-c-format
+#, fuzzy, 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 "
-"program (or, more precise, the Debian package that contains the program). "
+"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</"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 96c2d7ecb..3a9b4fbe0 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-09-07 11:54+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -20,10 +20,14 @@ msgstr "系统需求"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "本章包括运行 Debian 所需硬件的信息。您还能找到更多有关 GNU 和 &arch-kernel; "
@@ -47,13 +51,13 @@ msgstr "支持的硬件"
 #| "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 architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "Debian 不会超出 Linux 内核与 GNU 工具集所支持的硬件范围之外。因此，任何被移植"
 "了 Linux 内核、libc、<command>gcc</command> 等，并拥有对应的 Debian 移植版的"
@@ -79,9 +83,12 @@ msgstr "支持的体系"
 
 #. Tag: para
 #: hardware.xml:42
-#, no-c-format
+#, fuzzy, 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 "
+"&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</"
@@ -95,8 +102,9 @@ msgstr "体系"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Debian 命名"
 
 #. Tag: entry
@@ -444,7 +452,7 @@ msgstr "type"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -470,9 +478,9 @@ msgstr ""
 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."
+"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/"
@@ -557,11 +565,16 @@ msgstr "AMD64 和 Intel EM64T 处理器都获得支持。"
 
 #. Tag: para
 #: hardware.xml:277
-#, no-c-format
+#, fuzzy, 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 "
+"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 标准发布版只支持安装到一"
@@ -570,10 +583,14 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:286
-#, no-c-format
+#, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "大多数的 ARM CPU 可以运行在(big 或 little)任一 endian 模式下。但是当前绝大多"
@@ -594,14 +611,22 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:302
-#, no-c-format
+#, fuzzy, 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 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>."
+"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>."
 msgstr ""
 "Intel I/O Processor (IOP) 产品线可以在一些数据存储和处理的产品中找到。Debian "
 "当前支持 IOP32x 平台，IOP 80219 和 32x 芯片通常在 Network Attached Storage "
@@ -691,10 +716,13 @@ msgstr "<term>Versatile</term>"
 
 #. Tag: para
 #: hardware.xml:363
-#, no-c-format
+#, fuzzy, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 "Versatile 平台由 QEMU 模拟，如果您没有硬件设备，用它来测试运行在 ARM 上的 "
 "Debian 是一个不错的方法。"
@@ -730,24 +758,43 @@ 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>."
+#, fuzzy, 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\", "
+"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>."
 msgstr ""
 "然而，Debian GNU/Linux &releasename; 将<emphasis>不能</emphasis>运行在 386 或"
 "更早的处理器上。尽管体系命名为 \"i386\"，Debian 的 Sarge (r3.1) 版已经"
@@ -795,22 +842,37 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:484
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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, "
 "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> </"
+"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>."
+"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>."
 msgstr ""
 "&arch-title; 上的 Debian 支持以下平台：<itemizedlist> <listitem><para> SGI "
 "IP22： 该平台包括的 SGI 的 Indy、Indigo 2 和 Challenge S。由于这些机器非常近"
@@ -825,10 +887,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:519
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -849,17 +916,30 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:542
-#, no-c-format
-msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"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>."
@@ -918,9 +998,12 @@ msgstr "内核变种"
 
 #. Tag: para
 #: hardware.xml:618
-#, no-c-format
+#, fuzzy, 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 "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr "在 Debian 中有两种基于 CPU 类型的 powerpc 内核："
 
@@ -992,12 +1075,17 @@ msgstr "Power Macintosh (pmac) 子体系"
 
 #. Tag: para
 #: hardware.xml:688
-#, no-c-format
+#, fuzzy, 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "Apple (以及其它一些制造商 &mdash; 比如 Power Computing) 生产了一系列基于 "
 "PowerPC 处理器 的 Macintosh 计算机。为体系支持的目的，它们被划分为 NuBus"
@@ -1425,18 +1513,29 @@ 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>."
+#, fuzzy, 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 "
+"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>."
 msgstr ""
 "NuBus 系统现在还不被 Debian/powerpc 支持。单内核的 Linux/PPC 内核体系不支持这"
 "些机器；而必须使用 MkLinux Mach 微内核，而它未被 Debian 支持。它们包括： "
@@ -1562,11 +1661,15 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1068
-#, no-c-format
+#, fuzzy, 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."
+"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 "
 "位子体系在上一版本后已经停止支持。"
@@ -1651,11 +1754,18 @@ msgstr "多处理器"
 
 #. Tag: para
 #: hardware.xml:1129
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with SMP support. The "
+"&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."
@@ -1677,11 +1787,11 @@ msgstr ""
 #| "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 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>"
+"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 ""
 "为了给单 CPU 系统优化内核，您需要替换标准的 Debian 内核。<phrase arch="
 "\"linux-any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前"
@@ -1691,11 +1801,18 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1153
-#, no-c-format
+#, fuzzy, 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 "
-"Debian &release; kernel image has been compiled with <firstterm>SMP-"
+"&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."
@@ -1707,21 +1824,31 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1162
-#, no-c-format
+#, fuzzy, 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."
+"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
-#, no-c-format
+#, fuzzy, 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."
+"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; 内核映像并不支"
@@ -1740,7 +1867,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1753,14 +1880,22 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1195
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
 "&mdash; 在本体系架构下可以使用，并且有一个预编译的 Debian 内核映象已经开启这"
@@ -1822,13 +1957,19 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1231
-#, no-c-format
+#, 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;."
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"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 视频卡都"
 "能在 X.Org 下工作。更多的关于图形总线、显卡、显示器和指点设备的支持情况，见 "
@@ -2049,14 +2190,21 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1391
-#, 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>"
+#, fuzzy, 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 "
+"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 ""
 "有些情况下，您需要的驱动程序不包含在 Debian 软件包里面。必须在互联网上寻找它"
 "们的源码，并自己动手编译驱动程序。该如何做已经超出了本手册的范围。<phrase "
@@ -2309,9 +2457,15 @@ msgstr "特别为 GNU/&arch-kernel; 采购硬件"
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2472,14 +2626,21 @@ msgstr "安装介质"
 
 #. Tag: para
 #: hardware.xml:1674
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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 ""
 "本章将助您选则安装 Debian 所采用的介质。例如，您的电脑上有一个软驱，就可以用"
 "来安装 Debian。这里有一整章专门用于说明介质：<xref linkend=\"install-methods"
@@ -2625,10 +2786,17 @@ msgstr "U 盘"
 
 #. Tag: para
 #: hardware.xml:1767
-#, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2711,14 +2879,22 @@ msgstr "受支持的存储系统"
 
 #. Tag: para
 #: hardware.xml:1821
-#, 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="
+#, fuzzy, 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, "
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "Debian 启动盘包括一个用于最大可能数量系统的内核。不幸的是，这将产生一个大内"
@@ -2729,11 +2905,16 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:1831
-#, 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 "
+#, fuzzy, 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 驱"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index f8f22b32a..cb05ac45d 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -26,14 +26,28 @@ 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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -53,7 +67,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -62,7 +88,7 @@ msgid ""
 "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 "
+"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."
@@ -103,25 +129,33 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, 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
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "选择离您较近的(因此很可能也是最快的)镜像服务器，请参见 <ulink url=\"&url-"
 "debian-mirrors;\">Debian 镜像列表</ulink>。"
 
 #. Tag: para
 #: install-methods.xml:90
-#, no-c-format
+#, fuzzy, 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 "
+"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 镜像服务器下载文件的时候，请确认下载的文件是处于"
@@ -135,9 +169,15 @@ msgstr "在哪里能找到安装映像"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -194,10 +234,14 @@ msgstr "GLAN Tank 安装文件"
 
 #. Tag: para
 #: install-methods.xml:139
-#, no-c-format
+#, fuzzy, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 "GLAN Tank 需要内核和 ramdisk，位于您打算安装 Debian 的 ext2 磁盘分区上。这些"
@@ -211,10 +255,14 @@ msgstr "Kurobox Pro 安装文件"
 
 #. Tag: para
 #: install-methods.xml:150
-#, no-c-format
+#, fuzzy, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 "Kurobox Pro 需要内核和 ramdisk，位于您打算安装 Debian 的 ext2 磁盘分区上。这"
@@ -361,12 +409,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:291
-#, no-c-format
+#, fuzzy, 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>"
+"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 或 "
@@ -504,10 +559,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "这些工具可以在官方 Debian 光盘中找到，位于 <filename>/tools</filename> 目录"
 "下。"
@@ -520,10 +578,19 @@ 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 "
+#, fuzzy, 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 "
 "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 "
@@ -559,12 +626,17 @@ msgstr "写磁盘映像：使用<command>Disk Copy</command>"
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "假如您是使用官方 &debian-gnu; 光盘上的软盘映像文件，那么 Type 和 Creator 已经"
 "设置正确。以下 <command>Creator-Changer</command> 步骤只针对从 Debian 镜像下"
@@ -916,14 +988,23 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
 #: install-methods.xml:646
-#, no-c-format
+#, fuzzy, 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>),</"
 "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 "
+"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 ""
@@ -970,7 +1051,19 @@ msgstr "我们将展示如何使用 U 盘的第一个分区，而不是整个设
 
 #. Tag: para
 #: install-methods.xml:685
-#, no-c-format
+#, fuzzy, 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 "
@@ -981,7 +1074,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式"
 "化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来"
@@ -1086,10 +1179,18 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:768
-#, no-c-format
+#, fuzzy, 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 "
+"&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> "
@@ -1104,7 +1205,20 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:792
-#, no-c-format
+#, fuzzy, 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 "
@@ -1117,7 +1231,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "绝大多数 U 盘的预设置都不能让 Open Firmware 从该盘进行引导，因此您需要为 U 盘"
 "重新分区。在 Mac 系统上，执行 <userinput>mac-fdisk /dev/<replaceable>sdX</"
@@ -1250,12 +1364,17 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:878
-#, no-c-format
+#, fuzzy, 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>)."
+"&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 盘上。然后，卸"
@@ -1384,7 +1503,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1443,7 +1562,8 @@ 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:\\</filename>."
+"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"filename>."
 msgstr ""
 "将以下文件从 Debian 存档中拷贝到硬盘中比较方便的地方，比如 <filename>/boot/"
 "newinstall/</filename>。"
@@ -1471,14 +1591,24 @@ msgstr "在 OldWorld Macs 上引导硬盘安装程序"
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1493,12 +1623,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1544,10 +1686,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1663,10 +1810,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1152
-#, no-c-format
+#, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "一些较早的 HPPA 机器(比如 715/75)使用 RBOOTD 而不是 BOOTP。Debian 里面有一个 "
 "<classname>rbootd</classname> 软件包。"
@@ -1933,13 +2083,44 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1273
-#, no-c-format
+#, fuzzy, 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 "
 "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: "
+"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</"
@@ -2063,10 +2244,16 @@ 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 "
+#, fuzzy, 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."
@@ -2077,10 +2264,23 @@ msgstr ""
 
 #. 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 "
+#, fuzzy, 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 "
 "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 "
@@ -2271,8 +2471,8 @@ msgstr "自动化安装"
 #| "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 "
+"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 ""
@@ -2283,15 +2483,21 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, 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
+#, fuzzy, 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 "
+"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."
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index fa493fc37..2e21f34c8 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:20+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -81,12 +81,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "有些安装方法需要其它种类的映像而非 CD 的映像。<phrase condition=\"unofficial-"
 "build\"> <ulink url=\"&url-d-i;\">&d-i; 的主页</ulink> 上有到其它种类的映像的"
@@ -152,11 +157,15 @@ msgstr "软盘"
 
 #. Tag: para
 #: installation-howto.xml:93
-#, no-c-format
+#, fuzzy, 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."
+"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</"
@@ -223,10 +232,14 @@ msgstr "U 盘"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "我们也可以从移动 USB 存储设备来安装系统。比如说您带着一个 USB 的钥匙链走遍天"
@@ -234,14 +247,23 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:138
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -332,12 +354,21 @@ msgstr "从硬盘启动"
 
 #. Tag: para
 #: installation-howto.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a Debian CD image to the top-level directory of the hard "
+"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. </"
@@ -443,12 +474,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "如果您有一个 DOS 或 Windows 分区并想保留它，要小心使用自动分区。如果选择手动"
@@ -600,10 +637,13 @@ msgstr "末了&hellip;"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"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\"/>。"
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 08cb0e830..65554b577 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -14,14 +14,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, 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"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "决定 Debian 分区以及大小"
 
 #. Tag: para
@@ -108,14 +110,21 @@ msgstr "目录树"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">文件系统层次标准 (Filesystem "
 "Hierarchy Standard)</ulink> 安排文件以及文件命名。该标准让用户和软件程序预知"
@@ -385,15 +394,28 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:174
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 "
@@ -448,9 +470,16 @@ msgstr "推荐的分区方案"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -477,17 +506,27 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:240
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "如果您计划安装 Debian 发布版以外的程序，也许需要一个独立的 <filename>/usr/"
 "local</filename> 分区。如果您的机器是一个邮件服务器，也许需要为 <filename>/"
@@ -759,15 +798,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, 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 "
+#, fuzzy, 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."
@@ -783,9 +828,14 @@ msgstr "partman"
 
 #. Tag: para
 #: partitioning.xml:449
-#, no-c-format
-msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+#, fuzzy, 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."
@@ -986,14 +1036,22 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:591
-#, no-c-format
+#, fuzzy, 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 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 "
+"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."
 msgstr ""
 "如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 Debian 时保留"
@@ -1071,12 +1129,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index f26de975b..395d56ac6 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -84,7 +84,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -92,7 +101,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "Linux 是 Unix 的一种实现。<ulink url=\"&url-ldp;\">Linux 文档计划 (LDP)</"
@@ -104,19 +113,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "让自己适应 Debian"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "Debian 和其它的发行版有些不同。即使您熟悉其它发行版的 Linux，您也应该了解 "
@@ -126,15 +143,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "Debian 软件包系统"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -264,13 +297,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"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> 目录里有很多有用的文档，特别是 "
@@ -282,19 +323,33 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:204
-#, no-c-format
+#, fuzzy, 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 <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."
+"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;."
 msgstr ""
 "在 <ulink url=\"http://www.debian.org/\">Debian 网站</ulink> 上有大量的 "
 "Debian 相关文档。尤其要看看 <ulink url=\"http://www.debian.org/doc/FAQ/"
@@ -328,12 +383,17 @@ msgstr "让您的系统使用 E-Mail"
 
 #. Tag: para
 #: post-install.xml:239
-#, no-c-format
+#, fuzzy, 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 "今天，email 是许多人生活中一个重要的组成部分。建立它有很多种选择，并且对于很"
 "多 Debian 工具如何设置正确非常重要，我们将在本节介绍一些基本的知识。"
@@ -383,17 +443,28 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:269
-#, no-c-format
+#, fuzzy, 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 "
 "<command>kmail</command> or Mozilla's <command>thunderbird</command> (in "
-"Debian available as <command>icedove</command><footnote> <para> The reason "
+"&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 "
+"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."
 msgstr ""
 "配合逐步流行的图形桌面系统，使用图形 e-mail 程序，像 GNOME 的 "
@@ -472,10 +543,14 @@ msgstr "发送邮件到系统之外"
 
 #. Tag: para
 #: post-install.xml:335
-#, no-c-format
+#, fuzzy, 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 "
+"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 系统只架设了处理本地系统的邮件，而不是用于发送或接收"
@@ -509,13 +584,19 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:356
-#, no-c-format
+#, fuzzy, 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."
+"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 软件包对应"
@@ -721,11 +802,18 @@ msgstr "编译新内核"
 
 #. Tag: para
 #: post-install.xml:501
-#, no-c-format
+#, fuzzy, 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. "
-"Also, Debian often offers several alternative kernels. So you may want to "
+"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:"
@@ -789,9 +877,15 @@ msgstr "不要害怕尝试编译内核。它很有趣而且很合算。"
 
 #. Tag: para
 #: post-install.xml:552
-#, no-c-format
+#, fuzzy, 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: "
+"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</"
@@ -817,10 +911,17 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:569
-#, no-c-format
+#, fuzzy, 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 "
+"<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> "
@@ -867,7 +968,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -879,7 +993,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "现在，可以开始配置您的内核了。如果您已经安装配置好，并正在运行 X11，请执行 "
@@ -960,9 +1074,15 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:660
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po
index 280213927..1e0eaf225 100644
--- a/po/zh_CN/preface.po
+++ b/po/zh_CN/preface.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -20,13 +20,19 @@ msgstr "在 &architecture; 上安装 &debian-gnu; &release;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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; 将带给您来自世界各地的高质量的自由软"
@@ -35,10 +41,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 1cb5174af..20c38ef4e 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:21+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -20,9 +20,13 @@ msgstr "开始安装 &debian-gnu; 之前"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -37,11 +41,15 @@ msgstr "安装概述"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 时，极少出现必须进行完全重新安装的情"
 "况，导致这种情况的可能大多是硬盘的物理故障。"
@@ -61,15 +69,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -106,25 +125,32 @@ msgstr "在开始整个安装过程之前，收集您的计算机的硬件信息
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, 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
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "如果您不是使用 Debian CD，请寻找和(或)下载安装程序软件，还有用于您电脑上的特"
 "殊硬件的驱动程序；"
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "设置从磁带/软盘/USB 盘，或者其它存有系统启动文件的设备上启动(对于大多数 "
@@ -169,8 +195,9 @@ msgstr "加上一个或多个直接存取设备(DASD)；"
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 的分区；"
 
 #. Tag: para
@@ -363,10 +390,15 @@ msgstr "&list-install-manual-files;"
 
 #. Tag: para
 #: preparing.xml:252
-#, no-c-format
+#, fuzzy, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -376,10 +408,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:261
-#, no-c-format
+#, fuzzy, 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="
+"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="
@@ -455,10 +491,14 @@ msgstr "用于 &arch-title; 的 Linux"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"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 的章"
@@ -1037,11 +1077,19 @@ msgstr "5 GB"
 
 #. Tag: para
 #: preparing.xml:689
-#, no-c-format
+#, 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 48MB (for i386 and "
+#| "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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1090,12 +1138,22 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:721
-#, no-c-format
+#, fuzzy, 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. "
 "Notably, the <filename>/var</filename> partition contains a lot of state "
-"information specific to Debian in addition to its regular contents, like "
+"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 "
@@ -1157,11 +1215,11 @@ 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 "
+"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."
+"very least you will need a dedicated partition for the &debian; root."
 msgstr ""
 "如果您已经在您的机器中安装有操作系统<phrase arch=\"x86\"> (Windows 9x、"
 "Windows NT/2000/XP、OS/2、MacOS、Solaris、FreeBSD，&hellip;) </phrase> "
@@ -1217,10 +1275,15 @@ msgstr "FIXME: write about HP-UX disks?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1254,11 +1317,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1270,10 +1340,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "如果您的计算机上有 FAT 或 NTFS 文件系统，它被 DOS 和 Windows 使用，您可以等到"
@@ -1281,11 +1355,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1300,12 +1383,19 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:849
-#, no-c-format
+#, fuzzy, 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."
+"&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 和其它操作系统的安装过程可能会让您无法启动 "
@@ -1340,8 +1430,8 @@ msgid ""
 "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."
+"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; Linux 分区必须被安置在其它分区之"
 "前，特别是 MacOS 的启动分区。在事先分区时，这一点您必须牢记在心。即，您必须在"
@@ -1351,11 +1441,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "如果您现在有一块硬盘，这块硬盘上仅有一个分区(这是桌面电脑的通常设置)，同时希"
 "望能多重启动原有的操作系统和 Debian，那么您将需要："
@@ -1397,17 +1491,21 @@ msgstr "把原有的操作系统安装到属于它的新分区上。"
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr ""
 "启动到原有的操作系统，以确保一切正常，再下载 Debian 安装程序的启动文件。"
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, 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
@@ -1418,12 +1516,17 @@ msgstr "从 DOS 或 Windows 分区"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "如果您想在已有的 FAT 或 NTFS 分区上动手，那么建议您或者按照下面介绍的方案操"
 "作，或者使用 Windows 或者 DOS 自己的工具软件。否则的话，真的没必要从 DOS 或"
@@ -1431,13 +1534,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:937
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"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 ""
@@ -1455,11 +1566,22 @@ msgstr "在 DOS、Win-32 或者 OS/2 上的无损分区"
 
 #. Tag: para
 #: preparing.xml:954
-#, no-c-format
+#, 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), 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), or OS/2, and it is desired to put Debian onto the same disk without "
+"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 "
@@ -1476,14 +1598,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 的安装"
@@ -1507,17 +1636,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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> 的拷贝。您可以从离您最近的 "
@@ -1578,11 +1718,17 @@ msgstr "为 DOS 分区"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1594,12 +1740,17 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1031
-#, no-c-format
+#, fuzzy, 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:"
+"following command from &debian;:"
 msgstr ""
 "显然，当您为 DOS 新建分区或者改动分区大小时，最好把前面几个扇区全部清零。您应"
 "该在运行 DOS 的 <command>format</command> 命令之前，到 Debian 系统中，像这样"
@@ -1619,11 +1770,18 @@ msgstr "在 SunOS 下分区"
 
 #. Tag: para
 #: preparing.xml:1051
-#, no-c-format
+#, fuzzy, 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 "
-"partition using SunOS prior to installing Debian. The Linux kernel "
+"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."
@@ -1752,10 +1910,18 @@ msgstr "安装前的硬件和操作系统的相关设置"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1777,13 +1943,21 @@ msgstr "BIOS 设置菜单的使用"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "BIOS 为引导您的机器提供了基本的帮助，进而能让操作系统能访问您的硬件。您的系统"
 "应该会有 BIOS 的设置菜单，通过它，我们就能配置 BIOS。在进行安装前，您"
@@ -1913,7 +2087,16 @@ msgstr "选择引导设备"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -1921,7 +2104,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "许多 BIOS 的设置菜单都能让您选择用来引导系统的设备。我们来设置一下，让它先在 "
 "<filename>A:</filename> (第一个软驱)中找寻可引导的操作系统，不行的话，再在第"
@@ -2515,17 +2698,29 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:1668
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"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 ""
 "在实际安装之前，您必须仔细检查一些规划和准备步骤。IBM 有关于整个过程的文档，"
 "如，怎样准备安装介质和如何从该介质启动。这里毋需复制那些信息。但是，我们会在"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 8f369a99e..295affa40 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:22+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -540,12 +540,26 @@ 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"
+#, fuzzy, 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 "
+"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 "
@@ -919,14 +933,22 @@ msgstr "使用 DHCP 服务器指定预置文件"
 
 #. Tag: para
 #: preseed.xml:537
-#, no-c-format
+#, fuzzy, 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 "
 "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 "
+"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; "
 "package)."
 msgstr ""
 "还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 "
@@ -961,13 +983,19 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:557
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"automate &debian; installs should only be done with care."
 msgstr ""
 "使用 DHCP 预置的一个好方法是仅预置网络相关的值，比如所使用的 Debian 镜像。这"
 "种方式下在网络中安装将会自动选择一个合适的镜像，而其余的安装部分仍可以交互进"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 3b7077d94..ad3861e2f 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-14 15:56+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -821,7 +821,16 @@ msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -830,7 +839,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "本节说明如何通过现有的 Unix 或 Linux 系统来安装 &debian-gnu;，而非使用本手册"
 "后面要谈到的由菜单驱动的安装软件。这篇<quote>交叉安装(cross-install)</quote> "
@@ -842,13 +851,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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 系统，就可以将您原来系统中的用户数据"
 "(如果有的话)悉数迁移到 Debian 里去。然后就能继续爽了。一言以蔽之，这是一次"
@@ -857,11 +872,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:383
-#, no-c-format
+#, fuzzy, 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 "
-"also require more knowledge of Debian and of &arch-kernel; in general than "
+"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 "
@@ -913,10 +937,20 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:416
-#, no-c-format
+#, fuzzy, 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"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -963,17 +997,28 @@ msgstr "安装 <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:442
-#, 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>."
+#, fuzzy, 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 "
+"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 ""
 "Debian 安装程序使用的工具，同时也作为安装 Debian 基本系统的正式方法，是 "
 "<command>debootstrap</command>。它调用了 <command>wget</command> 和 "
@@ -986,14 +1031,25 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:472
-#, no-c-format
+#, fuzzy, 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"
 "# 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 "
+"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. "
@@ -1029,10 +1085,16 @@ msgstr "运行 <command>debootstrap</command>"
 
 #. Tag: para
 #: random-bits.xml:494
-#, no-c-format
+#, fuzzy, 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 "
+"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>."
@@ -1092,13 +1154,20 @@ msgstr "基本系统的配置"
 
 #. Tag: para
 #: random-bits.xml:535
-#, no-c-format
-msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+#, fuzzy, 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"
 "# 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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 "虽然功能还很弱，现在您的磁盘上已经有了一个真正的 Debian 系统。用 "
 "<command>chroot</command> 命令进入：<informalexample><screen>\n"
@@ -1183,7 +1252,48 @@ msgstr "分区的挂载"
 
 #. Tag: para
 #: random-bits.xml:591
-#, no-c-format
+#, fuzzy, 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:"
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
 "<informalexample><screen>\n"
@@ -1210,7 +1320,7 @@ msgid ""
 "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 "
+"</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"
@@ -1557,12 +1667,17 @@ msgstr "Boot Loader 的设置"
 
 #. Tag: para
 #: random-bits.xml:746
-#, no-c-format
+#, fuzzy, 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "要让您的 &debian-gnu; 系统能够启动，还要创建 boot loader，好让它能加载安装的"
 "内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot "
@@ -1583,8 +1698,8 @@ msgstr ""
 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 "
+"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 "
@@ -1662,11 +1777,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1758,12 +1881,19 @@ msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
 
 #. Tag: para
 #: random-bits.xml:841
-#, no-c-format
+#, fuzzy, 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 "本节将说明在没有以太网卡的情况下，如何通过一条 Null-Modem 线(也称为 Null-"
 "Printer 线)，连接到远端网关计算机来安装 &debian-gnu;。充当网关的计算机应该连"
@@ -1814,10 +1944,13 @@ msgstr "需求"
 
 #. Tag: para
 #: random-bits.xml:875
-#, no-c-format
+#, fuzzy, 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."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将要安装 Debian。"
 
 #. Tag: para
@@ -2219,11 +2352,18 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1150
-#, no-c-format
+#, fuzzy, 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\"> "
-"<para> The mini ISO image can be downloaded from a Debian mirror as "
+"<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."
@@ -2235,11 +2375,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:1163
-#, no-c-format
+#, fuzzy, 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 "
-"can be downloaded from a Debian mirror as described in <xref linkend="
+"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."
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 59da6cde0..57ccf2f3f 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:22+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -14,8 +14,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "使用 Debian 安装程序"
 
 #. Tag: title
@@ -26,9 +27,15 @@ msgstr "安装程序如何工作"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -315,8 +322,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "寻找并挂载 Debian 安装光盘。"
 
 #. Tag: term
@@ -354,10 +362,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr "列出 Debian 软件包镜像。用户可以选择从哪里安装软件包。"
 
 #. Tag: term
@@ -439,12 +450,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "让用户为系统中的磁盘分区，在分区上创建文件系统，并分配挂载点。它包括一些有趣"
 "的特性，如完全自动模式或 LVM 支持。Debian 里它是推荐使用的分区工具。"
@@ -623,11 +639,16 @@ msgstr "save-logs"
 
 #. Tag: para
 #: using-d-i.xml:381
-#, no-c-format
+#, fuzzy, 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "当用户遇到麻烦时，提供一种方式记录信息到软盘、网络、硬盘或其他介质，用于以后"
 "精确地给 Debian 开发人员报告安装程序的问题。"
@@ -655,15 +676,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -837,11 +869,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:530
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -1012,18 +1050,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, 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
+#, fuzzy, 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."
+"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</"
@@ -1031,7 +1075,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1042,9 +1100,9 @@ msgid ""
 "<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."
+"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</"
@@ -1850,13 +1908,19 @@ msgstr "手动分区"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "如果您选择手动分区的话，它的界面和上面介绍的导引式分区大体上相同。不同之处在"
 "于，界面上显示的是您当前的分区列表，而且其中并没有挂载点的信息。关于如何手动"
@@ -3825,13 +3889,19 @@ msgstr "检测其他的操作系统"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "在 boot loader 安装之前，安装程序会试着侦测已经安装到计算机上的其他操作系统。"
 "如果它找到支持的操作系统，您将在启动 boot loader 安装步骤里得到提示。与 "
@@ -3977,17 +4047,22 @@ msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "新 Debian 分区"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"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。"
@@ -4013,13 +4088,19 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2723
-#, no-c-format
+#, fuzzy, 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!"
+"&debian;!"
 msgstr ""
 "如果此步之后无法启动 Windows 9x (或 DOS)，您需要使用一个 Windows 9x (MS-DOS) "
 "启动盘，并用 <userinput>fdisk /mbr</userinput> 命令重新安装 MS-DOS 主引导记"
@@ -4150,10 +4231,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4169,11 +4255,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"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</"
@@ -4205,12 +4297,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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> 符号链接 "
@@ -4462,9 +4559,13 @@ msgstr "完成安装"
 
 #. Tag: para
 #: using-d-i.xml:3053
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -4524,11 +4625,15 @@ msgstr "重新启动系统"
 
 #. Tag: para
 #: using-d-i.xml:3103
-#, no-c-format
+#, fuzzy, 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."
+"new &debian; system."
 msgstr ""
 "您会被提示拿出用于安装启动的媒介(CD、软盘等)。之后，系统会启动到您的新 "
 "Debian 系统。"
@@ -4570,11 +4675,15 @@ msgstr "保存安装记录"
 
 #. Tag: para
 #: using-d-i.xml:3138
-#, no-c-format
+#, fuzzy, 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "如果安装成功，安装过程中创建的记录文件，会被自动保存在您的新 Debian 系统上的 "
 "<filename>/var/log/installer/</filename>。"
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index fb1c2c643..4dfb91f9d 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-04-07 12:22+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -14,17 +14,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "欢迎使用 Debian"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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; 发行版有一定的了解，请略过本章。"
@@ -341,17 +346,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, 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
+#, fuzzy, 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 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 "
+"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 "
@@ -369,9 +386,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -382,12 +404,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debian 在高级用户中非常流行的原因在于它具有优秀的技术，而且它对 Linux 的深入"
 "贡献满足了社区的需求与期望。Debian 为 Linux 引入的许多特性现在已经成为了非常"
@@ -395,9 +422,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -407,9 +439,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -419,11 +456,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -436,15 +482,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "为了提防 <quote>特洛伊木马</quote> 和其他恶意软件，更好地保护您的系统，"
 "Debian 服务器会校验 Debian 注册维护人员所上传的软件包。Debian 的打包人员也会"
@@ -453,15 +507,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "为您的 Debian GNU/Linux 系统寻求技术支持和联络 Debian 开发人员的主要的，也是"
 "最好的方法是通过 Debian 计划的邮件列表(书写本文时已有 &num-of-debian-"
@@ -473,28 +535,39 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "什么是 Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Debian GNU/Hurd 是将 Debian GNU 系统的 Linux 宏内核替换为 GNU Hurd &mdash; 运"
+"行在 GNU Mach 微内核上的一组服务。Hurd 还没有完成，不适合日常应用，但开发仍在"
+"继续。Hurd 当前仅为 i386 体系开发，当系统稳定之后也会移植到其他的体系。"
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -507,7 +580,7 @@ msgstr ""
 #| "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 "
+"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/hurd/\"> "
@@ -516,16 +589,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "什么是 Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -552,16 +626,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; 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/\"> "
@@ -570,19 +648,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "获得 Debian"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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;\">发行网页</ulink>。<ulink url=\"&url-"
@@ -591,9 +676,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -629,24 +718,34 @@ msgstr "文档的组织"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 的新手的使用手册。尽管它对用户的专业知识水平已 经做了尽量"
 "少的假设，但我们还是设想您对计算机硬件如何工作有一个基本 的了解。"
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "专业用户可以在本手册中找到一些有趣的参考信息，包括最小安装尺寸，Debian 安装程"
 "序支持的硬件细节，等等。我们鼓励专业用户有选择性的浏览本文档。"
@@ -674,12 +773,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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 创建分区空间。"
@@ -704,15 +808,24 @@ msgstr "讲述的是如何启动安装系统。本章还将讨论如何解决这
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "执行真正的安装是在 <xref linkend=\"d-i-intro\"/>。其中涉及选择语言，设置周边"
@@ -730,11 +843,15 @@ msgstr "从您新安装的基本系统启动，<xref linkend=\"boot-new\"/>。"
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "一旦您安装完系统，可以阅读 <xref linkend=\"post-install\"/>。该章将解释在哪里"
 "寻找更多有关 Unix 和 Debian 的信息，以及如何替换您的内核。"
@@ -791,7 +908,18 @@ msgstr "关于版权与软件协议"
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, 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 "
@@ -801,7 +929,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "我们相信您曾经阅读过许多商业软件的许可证 &mdash; 它们通常要求您只能在一台计算"
 "机上使用一份软件拷贝。本系统与它们完全不同。我们鼓励您将 &debian-gnu; 拷贝用"
@@ -829,16 +957,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "注意，Debian 计划因为考虑用户实用性，也有不符合我们自由规则的软件包存在。这些"
 "软件包不属于官方发行版，只存在于 <userinput>contrib</userinput> 或 "
@@ -848,7 +985,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -857,10 +1006,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "系统中很多软件所使用的许可证都是 <emphasis>GNU</emphasis> <emphasis>General "
 "Public License (通用公共授权)</emphasis>，通常简称为 <quote>the GPL</quote>。"
@@ -873,13 +1022,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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>"
@@ -888,9 +1043,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
diff --git a/po/zh_TW/administrivia.po b/po/zh_TW/administrivia.po
index 4c3cd5969..2fdd799c2 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-07-16 00:17+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -26,10 +26,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 ""
@@ -187,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 d5731c06d..4c6909240 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -26,7 +26,7 @@ msgid ""
 "&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."
+"new &debian; system."
 msgstr ""
 "本文件包含了在 &arch-title; (<quote>&architecture;</quote>) 硬體架構下 "
 "&debian-gnu; &release; 系統的安裝指引。文章內容還包括建立最適合您的 Debian 系"
@@ -34,17 +34,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 安裝系統 (\"boot-floppies\") 手冊而撰寫的，並"
 "且針對新的 Debian 安裝系統進行了增補和修訂。但是，在 &architecture; 架構下，"
diff --git a/po/zh_TW/boot-installer.po b/po/zh_TW/boot-installer.po
index 14aba79c5..f3555b243 100644
--- a/po/zh_TW/boot-installer.po
+++ b/po/zh_TW/boot-installer.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2005-07-18 14:56+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -94,8 +94,8 @@ msgstr "從光碟開機"
 #: boot-installer.xml:1469 boot-installer.xml:1831
 #, fuzzy, 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, "
+"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."
@@ -125,9 +125,15 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:89 boot-installer.xml:359 boot-installer.xml:830
 #: boot-installer.xml:1488 boot-installer.xml:1850
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -212,7 +218,7 @@ msgstr ""
 #, 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. "
+"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> "
@@ -278,7 +284,7 @@ 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> "
+"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:"
@@ -854,7 +860,7 @@ msgstr "開機提示"
 #| "boot method and, optionally, boot parameters."
 msgid ""
 "When the installer boots, you should be presented with a friendly graphical "
-"screen showing the Debian logo and a menu: <informalexample><screen>\n"
+"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
 "Installer boot menu\n"
 "\n"
 "Install\n"
@@ -970,16 +976,27 @@ msgstr "光碟的內容"
 
 #. Tag: para
 #: boot-installer.xml:848
-#, no-c-format
-msgid ""
-"There are three basic variations of Debian Install CDs. The "
+#, fuzzy, 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 "
 "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 "
+"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 "
+"The set of &debian; CDs can install a complete system from the wide range of "
 "packages without needing access to the network."
 msgstr ""
 "有三種基本的 Debian 安裝光碟衍生品：<emphasis>名片式</emphasis>光碟具有最少量"
@@ -1014,9 +1031,16 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:880
-#, no-c-format
-msgid ""
-"The Debian Installer CD contains a small EFI partition where the "
+#, fuzzy, 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 "
@@ -1164,10 +1188,14 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:986
-#, no-c-format
+#, fuzzy, 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 "
+"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 會顯示一個選單頁以選擇啟動核心和選項。進入"
@@ -1181,11 +1209,16 @@ msgstr "選項 2: 從 EFI Shell 啟動"
 
 #. Tag: para
 #: boot-installer.xml:997
-#, no-c-format
+#, fuzzy, 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 "
+"<command>EFI Shell [Built-in]</command>. Boot the &debian; Installer CD with "
 "the following steps:"
 msgstr ""
 "某些情況下，選項 1 無法成功，重新啟動機器然後在 EFI Boot Manager 畫面出現的時"
@@ -1261,9 +1294,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1049
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1414,11 +1453,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1156
-#, no-c-format
+#, fuzzy, 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."
+"screen of the &debian; Installer."
 msgstr ""
 "按下 <command>ENTER</command>。會載入並啟動核心。核心在 Debian 安裝程式的第一"
 "個螢幕顯示常規的初始化資訊。"
@@ -1579,13 +1622,19 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1292
-#, no-c-format
+#, fuzzy, 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."
+"start the &debian; Installer."
 msgstr ""
 "在下載並且處理設定檔後，boot-loader 將顯示它的提示符號。從這裡開始，安裝過程"
 "將和光碟安裝是同樣的過程。完成從網路的自動安裝核心後，選擇一個如同前文提到的"
@@ -1605,8 +1654,8 @@ 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 "
+"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."
@@ -1773,9 +1822,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1512
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1918,7 +1973,7 @@ msgid ""
 "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."
+"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 分割區"
@@ -2452,8 +2507,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-installer.xml:2082
-#, no-c-format
-msgid "Debian Installer Parameters"
+#, fuzzy, no-c-format
+#| msgid "Debian Installer Parameters"
+msgid "&debian; Installer Parameters"
 msgstr "Debian 安裝程式的參數"
 
 #. Tag: para
@@ -2642,9 +2698,13 @@ msgstr "INSTALL_MEDIA_DEV"
 
 #. Tag: para
 #: boot-installer.xml:2205
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -2812,7 +2872,7 @@ 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>."
+"found on the <ulink url=\"&url-d-i-wiki;\">&debian; Installer Wiki</ulink>."
 msgstr ""
 
 #. Tag: term
@@ -3101,11 +3161,11 @@ msgstr ""
 #, 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."
+"&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."
 msgstr ""
 
 #. Tag: term
@@ -3461,10 +3521,13 @@ msgstr "軟碟的可靠性"
 
 #. Tag: para
 #: boot-installer.xml:2819
-#, no-c-format
+#, fuzzy, 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."
+"The biggest problem for people using floppy disks to install &debian; seems "
+"to be floppy disk reliability."
 msgstr ""
 "對於第一次安裝 Debian 的人來說，他們遇到的最大的問題很可能是軟碟的可靠性。"
 
@@ -3895,12 +3958,13 @@ msgstr ""
 #: 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>."
+"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>."
 msgstr ""
 
 #. Tag: para
diff --git a/po/zh_TW/boot-new.po b/po/zh_TW/boot-new.po
index 68bc130ca..7463a010b 100644
--- a/po/zh_TW/boot-new.po
+++ b/po/zh_TW/boot-new.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2005-07-18 00:22+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -14,8 +14,9 @@ msgstr ""
 
 #. Tag: title
 #: boot-new.xml:5
-#, no-c-format
-msgid "Booting Into Your New Debian System"
+#, fuzzy, no-c-format
+#| msgid "Booting Into Your New Debian System"
+msgid "Booting Into Your New &debian; System"
 msgstr "啟動新 Debian 系統"
 
 #. Tag: title
@@ -40,8 +41,8 @@ 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="
 "\"x86\"> or possibly the <classname>lilo</classname> bootloader</phrase>. "
-"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 "
+"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."
 msgstr ""
@@ -52,7 +53,7 @@ msgstr ""
 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 "
+"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\"/>)."
@@ -62,11 +63,11 @@ msgstr ""
 #: 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 "
+"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 "
@@ -446,7 +447,7 @@ msgstr ""
 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). "
+"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</"
diff --git a/po/zh_TW/hardware.po b/po/zh_TW/hardware.po
index 715cddfd9..08a54a19c 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -20,10 +20,14 @@ msgstr "系統需求"
 
 #. Tag: para
 #: hardware.xml:7
-#, no-c-format
+#, fuzzy, 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 "
+"started with &debian;. You will also find links to further information about "
 "hardware supported by GNU and &arch-kernel;."
 msgstr ""
 "本章包括運作 Debian 所需硬體的資訊。您還能找到更多有關 GNU 和 &arch-kernel; "
@@ -47,13 +51,13 @@ msgstr "支援的硬體"
 #| "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 architecture "
-"or platform to which the Linux or kFreeBSD 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;."
+"&debian; does not impose hardware requirements beyond the requirements of "
+"the Linux or kFreeBSD kernel and the GNU tool-sets. Therefore, any "
+"architecture or platform to which the Linux or kFreeBSD 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;."
 msgstr ""
 "Debian 不會超出 Linux 核心與 GNU 工具集所支援的硬體範圍之外。因此，任何移植"
 "了 Linux 核心、libc、<command>gcc</command>，以及針對 Debian 移植的硬體架構或"
@@ -81,7 +85,7 @@ msgstr "支援的硬體架構"
 #: hardware.xml:42
 #, fuzzy, no-c-format
 msgid ""
-"Debian GNU/Linux &release; supports eleven major architectures and several "
+"&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>風味 "
@@ -95,8 +99,9 @@ msgstr "架構"
 
 #. Tag: entry
 #: hardware.xml:53 hardware.xml:179
-#, no-c-format
-msgid "Debian Designation"
+#, fuzzy, no-c-format
+#| msgid "Debian Designation"
+msgid "&debian; Designation"
 msgstr "Debian 命名"
 
 #. Tag: entry
@@ -445,7 +450,7 @@ msgstr "type"
 #. Tag: para
 #: hardware.xml:169
 #, no-c-format
-msgid "Debian GNU/kFreeBSD &release; supports two architectures."
+msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
 msgstr ""
 
 #. Tag: entry
@@ -471,9 +476,9 @@ msgstr ""
 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."
+"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."
@@ -548,8 +553,8 @@ msgstr ""
 #, fuzzy, 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 "
+"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 發行套件只支援安裝在"
@@ -561,7 +566,7 @@ msgstr ""
 #, fuzzy, 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 "
+"majority of current system implementation uses little-endian mode. &debian; "
 "currently only supports little-endian ARM systems."
 msgstr ""
 "大多數的 ARM CPU 可以運行在任一位元排列 (big-endian 或 little-endian) 模式"
@@ -585,11 +590,11 @@ msgstr ""
 #, 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>."
+"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>."
 msgstr ""
 
 #. Tag: term
@@ -660,7 +665,7 @@ msgstr "<term>powerpc</term>"
 #, 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."
+"test and run &debian; on ARM if you don't have the hardware."
 msgstr ""
 
 #. Tag: para
@@ -693,22 +698,23 @@ msgstr ""
 #: 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>."
+"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>."
 msgstr ""
 
 #. Tag: para
@@ -744,20 +750,20 @@ msgstr ""
 #: hardware.xml:484
 #, fuzzy, no-c-format
 msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+"&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> </"
+"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>."
+"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>."
 msgstr ""
 "Debian 目前在 &arch-title; 上支援兩種子架構：<itemizedlist> <listitem><para> "
 "SGI IP22：該平台包括的 SGI Indy、Indigo 2 和 Challenge S。由於這些機器非常相"
@@ -774,7 +780,7 @@ msgstr ""
 #, fuzzy, 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 "
+"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 ""
@@ -797,15 +803,15 @@ msgstr ""
 #: hardware.xml:542
 #, fuzzy, no-c-format
 msgid ""
-"Debian on &arch-title; supports the following platforms: <itemizedlist> "
+"&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 "
+"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 "
+"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>."
@@ -868,7 +874,7 @@ msgstr "核心風味"
 #| "There are four 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 "
+"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
 "type:"
 msgstr "在 Debian 中有四種以處理器分類的 powerpc 核心："
 
@@ -944,7 +950,7 @@ 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."
+"NuBus (not supported by &debian;), OldWorld, and NewWorld."
 msgstr ""
 "Apple (以及其它一些製造商 &mdash; 例如 Power Computing) 生產了一系列以 "
 "PowerPC 處理器為基礎的 Macintosh 電腦。為了架構支援，它們被劃分為 NuBus、"
@@ -1376,16 +1382,16 @@ msgstr ""
 #: hardware.xml:952
 #, fuzzy, 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>."
+"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>."
 msgstr ""
 "debian/powerpc 目前還不支援 NuBus 系統。單核心的 Linux/PPC 架構不支援這些機"
 "器；而且必須使用 MkLinux Mach 微核心，該核心尚未被 Debian 支援。它們包括："
@@ -1503,9 +1509,9 @@ msgstr ""
 #: hardware.xml:1068
 #, 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."
+"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
@@ -1588,7 +1594,7 @@ msgstr "多處理器"
 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 "
+"&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."
@@ -1610,11 +1616,11 @@ msgstr ""
 #| "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 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>"
+"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 ""
 "為了最佳化單處理器系統核心，您需要替換標準的 Debian 核心。<phrase arch="
 "\"linux-any\">您可以在 <xref linkend=\"kernel-baking\"/> 找到相關的討論。目前"
@@ -1628,7 +1634,7 @@ msgstr ""
 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-"
+"&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."
@@ -1642,8 +1648,8 @@ msgstr ""
 #: hardware.xml:1162
 #, no-c-format
 msgid ""
-"The 486 flavour of the Debian kernel image packages for &arch-title; is not "
-"compiled with SMP support."
+"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
+"not compiled with SMP support."
 msgstr ""
 
 #. Tag: para
@@ -1652,9 +1658,9 @@ msgstr ""
 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."
+"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 multi-processing</quote> 或 SMP "
 "&mdash; 在本硬體架構下是受到支援的。但是，標準的 Debian &release; 核心並不支"
@@ -1673,7 +1679,7 @@ msgstr ""
 #| "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 "
+"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;</"
@@ -1690,10 +1696,10 @@ msgstr ""
 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."
+"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 ""
 "多處理器 &mdash; 又稱為 <quote>symmetric multi-processing</quote> 或 SMP "
 "&mdash; 在本架構架構下是受到支援的，並且有一個預先編譯的 Debian 核心映像檔已"
@@ -1749,11 +1755,11 @@ msgstr ""
 #: hardware.xml:1231
 #, fuzzy, no-c-format
 msgid ""
-"Debian's support for graphical interfaces is determined by the underlying "
+"&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;."
+"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 下工作。更多的關於圖形匯流排、顯示卡、顯示器和指點設備的支援"
@@ -1949,12 +1955,12 @@ msgstr ""
 #: hardware.xml:1391
 #, 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>"
+"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
@@ -2170,9 +2176,15 @@ msgstr "特別為 GNU/&arch-kernel; 採購硬體"
 
 #. Tag: para
 #: hardware.xml:1572
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2330,11 +2342,11 @@ msgstr "安裝媒介"
 #, fuzzy, 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."
+"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 ""
 "本章將幫助您選擇安裝 Debian 可用的不同媒介。例如，您的電腦上有一個軟碟機，它"
 "就可以用來安裝 Debian。這裡有一整章專門用於說明安裝媒介：<xref linkend="
@@ -2478,10 +2490,17 @@ msgstr "USB 隨身碟"
 
 #. Tag: para
 #: hardware.xml:1767
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -2560,14 +2579,22 @@ msgstr "支援的儲存系統"
 
 #. Tag: para
 #: hardware.xml:1821
-#, no-c-format
+#, fuzzy, 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, which "
-"includes many drivers that won't be used for your machine<phrase arch="
+"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 "
+"is desirable in general, to ensure that &debian; can be installed on the "
 "widest array of hardware."
 msgstr ""
 "Debian 開機磁碟包括一個最可能在所有支援的系統上運作的核心。不幸的是，這將產生"
@@ -2580,9 +2607,9 @@ msgstr ""
 #: hardware.xml:1831
 #, fuzzy, 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 "
+"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 設備、IDE 軟碟機、平行 IDE 設備、"
diff --git a/po/zh_TW/install-methods.po b/po/zh_TW/install-methods.po
index b12395681..b2abd264b 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -26,14 +26,28 @@ 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 "
+#, fuzzy, 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-"
+"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 "
+"\">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 "
@@ -53,7 +67,19 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:30
-#, no-c-format
+#, fuzzy, 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-"
@@ -62,7 +88,7 @@ msgid ""
 "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 "
+"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."
@@ -103,16 +129,20 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:83
-#, no-c-format
-msgid "Downloading Files from Debian Mirrors"
+#, fuzzy, 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
+#, fuzzy, 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>."
+"url=\"&url-debian-mirrors;\">list of &debian; mirrors</ulink>."
 msgstr ""
 "選擇離您較近的 (因此很可能也是最快的) 鏡像伺服器，請參閱 <ulink url=\"&url-"
 "debian-mirrors;\">Debian 鏡像列表</ulink>。"
@@ -124,7 +154,7 @@ msgstr ""
 #| "When downloading files from a Debian mirror, 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 "
+"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 鏡像伺服器下載檔案的時候，請確認以<emphasis>二進位</emphasis>模式"
@@ -138,9 +168,15 @@ msgstr "哪裡能找到安裝映像檔"
 
 #. Tag: para
 #: install-methods.xml:100
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -195,7 +231,7 @@ msgstr "CATS 的安裝檔案"
 #, 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 "
+"on which you intend to install &debian;. These images can be obtained from "
 "&glantank-firmware-img;."
 msgstr ""
 
@@ -211,7 +247,7 @@ msgstr "RiscPC 的安裝檔案"
 #, 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 "
+"disk on which you intend to install &debian;. These images can be obtained "
 "from &kuroboxpro-firmware-img;."
 msgstr ""
 
@@ -350,9 +386,10 @@ msgstr ""
 #, 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>"
+"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 ""
 
 #. Tag: para
@@ -489,10 +526,13 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"These tools can be found on the Official &debian; CD-ROMs under the "
+"<filename>/tools</filename> directory."
 msgstr ""
 "這些工具可以在官方 Debian光碟中找到。他們位於 <filename>/tools</filename> 目"
 "錄下。"
@@ -505,10 +545,19 @@ 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 "
+#, fuzzy, 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 "
 "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 "
@@ -544,12 +593,17 @@ msgstr "寫入磁碟映像檔：使用<command>Disk Copy</command>"
 
 #. Tag: para
 #: install-methods.xml:426
-#, no-c-format
+#, fuzzy, 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."
+"necessary if you downloaded the image files from a &debian; mirror."
 msgstr ""
 "假如您是使用官方 &debian-gnu;光碟上的軟碟映像檔文件，那麼 Type 和 Creator 已"
 "經設置正確。 以下 <command>Creator-Changer</command> 步驟只針對從 Debian 鏡像"
@@ -869,7 +923,7 @@ msgid ""
 "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 "
+"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 ""
@@ -931,7 +985,7 @@ msgid ""
 "# 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."
+"the <classname>dosfstools</classname> &debian; package."
 msgstr ""
 "由於大多數 USB 隨身碟預先設置了一個單獨的 FAT16 分割區， 您可能不需要重新分割"
 "或者格式化 USB 隨身碟。如果您必須這麼做，請使用 <command>cfdisk</command> 或"
@@ -1068,7 +1122,7 @@ msgstr ""
 #, 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 "
+"&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> "
@@ -1103,7 +1157,7 @@ msgid ""
 "$ 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."
+"the <classname>hfsutils</classname> &debian; package."
 msgstr ""
 "絕大多數 USB 隨身碟的預設設定都不能讓 Open Firmware 從該儲存進行開機，因此您"
 "需要將儲存重新分割。在 Mac 系統上，執行 <userinput>mac-fdisk /dev/sda</"
@@ -1259,9 +1313,9 @@ msgstr ""
 #, 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>)."
+"&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 ""
 
 #. Tag: title
@@ -1388,7 +1442,7 @@ msgstr ""
 #| "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 "
+"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 ""
@@ -1447,7 +1501,8 @@ 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:\\</filename>."
+"Copy the following files from a &debian; CD image to <filename>c:\\</"
+"filename>."
 msgstr ""
 "將以下檔案從 Debian 檔案庫中拷貝到硬碟中比較方便的地方，例如 <filename>/boot/"
 "newinstall/</filename>。"
@@ -1475,14 +1530,24 @@ msgstr "OldWorld Macs 上的硬碟開機安裝程式"
 
 #. Tag: para
 #: install-methods.xml:1020
-#, no-c-format
+#, fuzzy, 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</"
 "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 "
+"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."
@@ -1497,12 +1562,24 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1033
-#, no-c-format
+#, fuzzy, 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 "
 "<filename>dists/woody/main/disks-powerpc/current/powermac</filename> "
-"directory on Debian http/ftp mirrors and official Debian CDs. Use "
+"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."
@@ -1547,10 +1624,15 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:1065
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1670,7 +1752,7 @@ msgstr ""
 #, fuzzy, 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."
+"is an <classname>rbootd</classname> package available in &debian;."
 msgstr ""
 "一些較早的 HPPA 機器 (例如 715/75) 使用 RBOOTD 而不是 BOOTP。在 parisc-linux "
 "網站上能夠找到 RBOOTD 軟體套件。"
@@ -1942,7 +2024,7 @@ msgid ""
 "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: "
+"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</"
@@ -2052,8 +2134,8 @@ msgstr ""
 #: 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 "
+"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."
@@ -2063,8 +2145,8 @@ msgstr ""
 #: install-methods.xml:1358
 #, fuzzy, 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 "
+"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 "
@@ -2262,8 +2344,8 @@ msgstr "自動化安裝"
 #| "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 "
+"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 ""
@@ -2274,15 +2356,16 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:1603
-#, no-c-format
-msgid "Automatic Installation Using the Debian Installer"
+#, fuzzy, 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
 #, fuzzy, no-c-format
 msgid ""
-"The Debian Installer supports automating installs via preconfiguration "
+"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."
diff --git a/po/zh_TW/installation-howto.po b/po/zh_TW/installation-howto.po
index 29757e95f..dff598f0d 100644
--- a/po/zh_TW/installation-howto.po
+++ b/po/zh_TW/installation-howto.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2005-06-10 01:57+0800\n"
 "Last-Translator: Lin Shu-Fen<satashiohno@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -82,12 +82,17 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
-#, no-c-format
+#, fuzzy, 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."
+"\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 "有些安裝方式需要其它種類的映像而非光碟映像檔。<phrase condition=\"unofficial-"
 "build\"> <ulink url=\"&url-d-i;\">&d-i; 的網頁</ulink> 上有其它映像檔的連結。"
@@ -154,9 +159,9 @@ msgstr "軟碟"
 #: installation-howto.xml:93
 #, fuzzy, 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."
+"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 ""
 "如果您無法利用光碟進行開機動作，不妨下載一些軟碟的映像檔，用它們來安裝 "
 "Debian，包括 <filename>floppy/boot.img</filename> 、 <filename>floppy/root."
@@ -221,10 +226,14 @@ msgstr "USB 隨身碟"
 
 #. Tag: para
 #: installation-howto.xml:132
-#, no-c-format
+#, fuzzy, 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 "
+"example a USB keychain can make a handy &debian; install medium that you can "
 "take with you anywhere."
 msgstr ""
 "我們也可以透過 USB 隨身碟來安裝套件。無論到哪你都可帶著 USB 隨身碟，這是一個"
@@ -239,7 +248,7 @@ msgid ""
 "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 "
+"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 ""
@@ -335,7 +344,7 @@ 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 "
+"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. </"
@@ -446,12 +455,18 @@ msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:256
-#, no-c-format
+#, fuzzy, 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 "
+"partitions to create room for the &debian; install: simply select the "
 "partition and specify its new size."
 msgstr ""
 "如果您想保留一個既存的 DOS 或 Windows 磁區，要小心使用自動分割磁區。如果您選"
@@ -591,10 +606,13 @@ msgstr "最後......"
 
 #. Tag: para
 #: installation-howto.xml:350
-#, no-c-format
+#, fuzzy, 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\"/>."
+"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\"/>。"
diff --git a/po/zh_TW/partitioning.po b/po/zh_TW/partitioning.po
index 906f955aa..41eff0408 100644
--- a/po/zh_TW/partitioning.po
+++ b/po/zh_TW/partitioning.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2005-07-18 13:23+0800\n"
 "Last-Translator: Lin, Shu-Fen<satashiohno@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -14,14 +14,16 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:5
-#, no-c-format
-msgid "Partitioning for Debian"
+#, fuzzy, 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"
+#, fuzzy, no-c-format
+#| msgid "Deciding on Debian Partitions and Sizes"
+msgid "Deciding on &debian; Partitions and Sizes"
 msgstr "決定 Debian 磁區及大小"
 
 #. Tag: para
@@ -108,14 +110,21 @@ msgstr "目錄樹"
 
 #. Tag: para
 #: partitioning.xml:68
-#, no-c-format
+#, fuzzy, 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 "
 "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:"
+"<filename>/</filename>. At the root level, all &debian; systems include "
+"these directories:"
 msgstr ""
 "&debian-gnu; 依照 <ulink url=\"&url-fhs-home;\">檔案系統層次標準 (Filesystem "
 "Hierarchy Standard)</ulink> 為目錄以及檔案命名。這個標準允許使用者以及軟體程"
@@ -392,8 +401,8 @@ msgid ""
 "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 "
+"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 "
@@ -450,9 +459,16 @@ msgstr "建議的分割方案"
 
 #. Tag: para
 #: partitioning.xml:223
-#, no-c-format
-msgid ""
-"For new users, personal Debian boxes, home systems, and other single-user "
+#, fuzzy, 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 "
 "the easiest, simplest way to go. However, if your partition is larger than "
 "around 6GB, choose ext3 as your partition type. Ext2 partitions need "
@@ -483,14 +499,14 @@ msgstr ""
 #, fuzzy, 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."
+"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."
 msgstr ""
 "若您打算安裝許多不是 Debian 分發版本的程式時，您或許需要另一個獨立的 "
 "<filename>/usr/local</filename> 分割區。如果您的機器是一個小的郵件伺服器，您"
@@ -760,15 +776,21 @@ msgstr ""
 
 #. Tag: title
 #: partitioning.xml:435
-#, no-c-format
-msgid "Debian Partitioning Programs"
+#, fuzzy, no-c-format
+#| msgid "Debian Partitioning Programs"
+msgid "&debian; Partitioning Programs"
 msgstr "Debian 分割程式"
 
 #. Tag: para
 #: partitioning.xml:436
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -786,7 +808,7 @@ msgstr "partman"
 #: partitioning.xml:449
 #, fuzzy, no-c-format
 msgid ""
-"Recommended partitioning tool in Debian. This Swiss army knife can also "
+"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."
@@ -987,11 +1009,11 @@ msgstr ""
 #, fuzzy, 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 "
+"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."
 msgstr ""
 "如果您已經有其他作業系統存在，像是 DOS 或 Windows，而且想在安裝 Debian 時保留"
@@ -1069,12 +1091,24 @@ msgstr ""
 
 #. Tag: para
 #: partitioning.xml:641
-#, no-c-format
+#, fuzzy, 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 "
 "<quote>Enhanced Disk Drive Support Specification</quote>. Both Lilo, the "
-"Linux loader, and Debian's alternative <command>mbr</command> must use 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 "
diff --git a/po/zh_TW/post-install.po b/po/zh_TW/post-install.po
index 8692f5199..dd10330f2 100644
--- a/po/zh_TW/post-install.po
+++ b/po/zh_TW/post-install.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2005-07-18 13:24+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -73,7 +73,16 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:55
-#, no-c-format
+#, fuzzy, 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 "
@@ -81,7 +90,7 @@ msgid ""
 "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 "
+"International versions of the LDP HOWTOs are also available as &debian; "
 "packages."
 msgstr ""
 "Linux 是 Unix 的實作。<ulink url=\"&url-ldp;\">Linux 文件計劃 (LDP)</ulink> "
@@ -93,19 +102,27 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:76
-#, no-c-format
-msgid "Orienting Yourself to Debian"
+#, fuzzy, no-c-format
+#| msgid "Orienting Yourself to Debian"
+msgid "Orienting Yourself to &debian;"
 msgstr "讓您自己轉向 Debian"
 
 #. Tag: para
 #: post-install.xml:77
-#, no-c-format
+#, fuzzy, 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 "
+"&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 "
+"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 "
+"a tutorial for how to use &debian;, but just a very brief glimpse of the "
 "system for the very rushed."
 msgstr ""
 "Debian 和其它的發行版有些不同。即使您熟悉其它發行版的 Linux，您也應該瞭解 "
@@ -115,15 +132,31 @@ msgstr ""
 
 #. Tag: title
 #: post-install.xml:88
-#, no-c-format
-msgid "Debian Packaging System"
+#, fuzzy, no-c-format
+#| msgid "Debian Packaging System"
+msgid "&debian; Packaging System"
 msgstr "Debian 軟體套件系統"
 
 #. Tag: para
 #: post-install.xml:89
-#, no-c-format
+#, fuzzy, 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 "
+"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>) </"
@@ -254,13 +287,21 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:193
-#, no-c-format
+#, fuzzy, 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 "
 "<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, "
+"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> 目錄裡有很多有用的文件，特別是 "
@@ -275,16 +316,17 @@ msgstr ""
 #, fuzzy, 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."
+"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;."
 msgstr ""
 "在 <ulink url=\"http://www.debian.org/\">Debian 網站</ulink> 上有大量的 "
 "Debian 相關文件。尤其是 <ulink url=\"http://www.debian.org/doc/FAQ/\">Debian "
@@ -318,8 +360,8 @@ msgstr ""
 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."
+"important for some &debian; utilities, we will try to cover the basics in "
+"this section."
 msgstr ""
 
 #. Tag: para
@@ -361,12 +403,12 @@ 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 "
+"&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 "
+"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."
 msgstr ""
 
@@ -425,8 +467,8 @@ msgstr ""
 #: 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 "
+"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 ""
 
@@ -456,9 +498,9 @@ msgstr ""
 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."
+"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 ""
 
 #. Tag: para
@@ -638,8 +680,8 @@ msgstr "編譯新核心"
 #, fuzzy, 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 "
+"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:"
@@ -703,7 +745,7 @@ msgstr "不要害怕嘗試編譯核心。它很有趣而且很有好處。"
 #: post-install.xml:552
 #, fuzzy, no-c-format
 msgid ""
-"To compile a kernel the Debian way, you need some packages: "
+"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</"
@@ -733,7 +775,7 @@ msgstr ""
 #, fuzzy, 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 "
+"<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> "
@@ -781,7 +823,20 @@ msgstr ""
 
 #. Tag: para
 #: post-install.xml:605
-#, no-c-format
+#, fuzzy, 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 "
@@ -793,7 +848,7 @@ msgid ""
 "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 "
+"selected by default). If not included, your &debian; installation will "
 "experience problems."
 msgstr ""
 "現在，您可以開始設定您的核心了。如果您已經安裝並正在執行 X11， 請執行 "
@@ -878,7 +933,7 @@ msgstr ""
 #: post-install.xml:660
 #, fuzzy, no-c-format
 msgid ""
-"For more information on Debian kernels and kernel compilation, see the "
+"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>."
diff --git a/po/zh_TW/preface.po b/po/zh_TW/preface.po
index 1f3e488ad..6884069cd 100644
--- a/po/zh_TW/preface.po
+++ b/po/zh_TW/preface.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -20,13 +20,19 @@ msgstr "在 &architecture; 架構上安裝 &debian-gnu; &release;"
 
 #. Tag: para
 #: preface.xml:6
-#, no-c-format
+#, fuzzy, 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."
+"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; 集合了來自世界各地的高品質自由軟體，並將它們"
@@ -34,10 +40,18 @@ msgstr ""
 
 #. Tag: para
 #: preface.xml:15
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
diff --git a/po/zh_TW/preparing.po b/po/zh_TW/preparing.po
index cbe54ba7c..a860dfb09 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -20,9 +20,13 @@ msgstr "安裝 &debian-gnu; 之前"
 
 #. Tag: para
 #: preparing.xml:6
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -37,11 +41,15 @@ msgstr "安裝概述"
 
 #. Tag: para
 #: preparing.xml:20
-#, no-c-format
+#, fuzzy, 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."
+"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 時，必須進行完全重新安裝的情況非"
 "常少見，可能導致這種情況的大多是硬碟的物理故障。"
@@ -61,15 +69,26 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:35
-#, no-c-format
+#, fuzzy, 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 "
 "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-"
+"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."
 msgstr ""
@@ -106,25 +125,32 @@ msgstr "在開始安裝之前，收集您電腦的硬體資料和可能會用到
 
 #. Tag: para
 #: preparing.xml:68
-#, no-c-format
-msgid "Create partitionable space for Debian on your hard disk."
+#, fuzzy, 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
+#, fuzzy, 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)."
+"files your machine requires (except &debian; CD users)."
 msgstr ""
 "如果您不是使用 Debian 安裝光碟，請尋找和 (或) 下載安裝程式軟體，還有用於您電"
 "腦上特殊硬體的驅動程式﹔"
 
 #. Tag: para
 #: preparing.xml:79
-#, no-c-format
+#, fuzzy, 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 "
+"Set up boot tapes/floppies/USB sticks, or place boot files (most &debian; CD "
 "users can boot from one of the CDs)."
 msgstr ""
 "設置從開機磁帶、軟碟、USB 隨身碟，或者其它存有系統開機檔案的設備 (對於大多數 "
@@ -169,8 +195,9 @@ msgstr "加上一個或多個直接存取儲存設備(Direct Access Storage Devi
 
 #. Tag: para
 #: preparing.xml:117
-#, no-c-format
-msgid "Create and mount the partitions on which Debian will be installed."
+#, fuzzy, 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 的分割區﹔"
 
 #. Tag: para
@@ -350,7 +377,7 @@ msgstr "&list-install-manual-files;"
 #, 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 "
+"Installation Guide for the &releasename; release of &debian;; available in "
 "<ulink url=\"&url-release-area;/installmanual\">various formats and "
 "translations</ulink>."
 msgstr ""
@@ -360,7 +387,7 @@ msgstr ""
 #, 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="
+"Installation Guide for the next release of &debian;; available in <ulink url="
 "\"&url-d-i-alioth-manual;\">various formats and translations</ulink>."
 msgstr ""
 
@@ -434,10 +461,14 @@ msgstr "用於 &arch-title; 的 Linux"
 
 #. Tag: para
 #: preparing.xml:340
-#, no-c-format
+#, fuzzy, 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 "
+"It has no chapter about &debian; but the basic installation concepts are the "
 "same across all &arch-title; distributions."
 msgstr ""
 "IBM Redbook 介紹可用於大型主機的 Linux 發行套件。其中沒有關於 Debian 的章節，"
@@ -1025,7 +1056,7 @@ msgstr "1 GB"
 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 48MB (for i386 and "
+"install &debian; with as little as 20MB (for s390) to 48MB (for i386 and "
 "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."
@@ -1068,7 +1099,7 @@ 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 "
+"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 "
@@ -1121,11 +1152,11 @@ 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 "
+"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."
+"very least you will need a dedicated partition for the &debian; root."
 msgstr ""
 "如果您已經在您的機器中安裝作業系統 <phrase arch=\"i386\"> (Windows 9x, "
 "Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> "
@@ -1174,10 +1205,15 @@ msgstr "FIXME: write about HP-UX disks?"
 
 #. Tag: para
 #: preparing.xml:799
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1211,11 +1247,18 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:821
-#, no-c-format
+#, fuzzy, 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 "
-"wait and use the Debian installer's partitioning program. You should still "
+"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."
@@ -1228,10 +1271,14 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:831
-#, no-c-format
+#, fuzzy, 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 "
+"you can wait and use &debian; installer's partitioning program to resize the "
 "filesystem."
 msgstr ""
 "如果您的電腦上有被 DOS 和 Windows 使用的 FAT 或 NTFS 檔案系統，您可以等到用 "
@@ -1239,11 +1286,20 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:837
-#, no-c-format
+#, fuzzy, 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 some "
-"of the partitions will be owned by other operating systems, you should "
+"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, "
@@ -1258,12 +1314,19 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:849
-#, no-c-format
+#, fuzzy, 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."
+"&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，也"
@@ -1298,8 +1361,8 @@ msgid ""
 "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."
+"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; Linux 分割區必須被安置在其它分割"
 "區之前，特別是 MacOS 的開機分割區。在分割之前時，這一點您必須牢記在心。也就是"
@@ -1310,11 +1373,15 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:874
-#, no-c-format
+#, fuzzy, 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:"
+"and &debian;, you will need to:"
 msgstr ""
 "如果您現在有一塊硬碟，這塊硬碟上僅有一個分割區 (這是桌面電腦的常見設定)，同時"
 "您希望能多重開機原有的作業系統和 Debian，那麼您就需要："
@@ -1356,16 +1423,20 @@ msgstr "把原有作業系統安裝到屬於它的新分割區上。"
 
 #. Tag: para
 #: preparing.xml:908
-#, no-c-format
+#, fuzzy, 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."
+"the &debian; installer boot files."
 msgstr "開機到原有作業系統，以確保一切正常，再下載 Debian 安裝程式的開機檔案。"
 
 #. Tag: para
 #: preparing.xml:914
-#, no-c-format
-msgid "Boot the Debian installer to continue installing Debian."
+#, 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
@@ -1376,12 +1447,17 @@ msgstr "DOS 或 Windows 下的分割"
 
 #. Tag: para
 #: preparing.xml:929
-#, no-c-format
+#, fuzzy, 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."
+"&debian; partitioning tools will generally do a better job."
 msgstr ""
 "如果您想在已有的 FAT 或 NTFS 分割區上動手，那麼建議您或者按照下面介紹的方案操"
 "作，或者使用 Windows 或 DOS 自己的工具軟體。否則的話，真的沒必要從 DOS 或者 "
@@ -1394,8 +1470,8 @@ 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 "
+"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 ""
@@ -1417,7 +1493,7 @@ msgstr "在 DOS、Win-32 或者 OS/2 下的無害分割"
 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 "
+"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 "
@@ -1434,14 +1510,21 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:966
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"&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 "
@@ -1466,17 +1549,28 @@ msgstr ""
 
 #. Tag: para
 #: preparing.xml:984
-#, no-c-format
+#, 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> 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</"
+"&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> 的拷貝。您可以從離您最近的 "
@@ -1537,11 +1631,17 @@ msgstr "DOS 下的分割"
 
 #. Tag: para
 #: preparing.xml:1023
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -1558,7 +1658,7 @@ 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:"
+"following command from &debian;:"
 msgstr ""
 "顯然地，當您為 DOS 建立新分割區或者更動分割區大小時，最好總是把第一個磁區全部"
 "清除為零。執行 DOS 的 <command>format</command> 指令之前，於 Debian 系統中，"
@@ -1581,8 +1681,8 @@ msgstr "SunOS 下的分割"
 #, fuzzy, 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 "
+"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."
@@ -1715,10 +1815,18 @@ msgstr "安裝前硬體和作業系統的相關設定"
 
 #. Tag: para
 #: preparing.xml:1141
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -1739,13 +1847,21 @@ msgstr "使用 BIOS 設定選單"
 
 #. Tag: para
 #: preparing.xml:1165
-#, no-c-format
+#, fuzzy, 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 "
 "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."
+"doing so can lead to intermittent crashes or an inability to install "
+"&debian;."
 msgstr ""
 "BIOS 為啟動您的機器提供了基本的幫助，進而能讓您的作業系統能存取您的硬體。您的"
 "系統應該會有 BIOS 的設定選單，透過它，我們就能配置 BIOS。在進行安裝前，您"
@@ -1875,7 +1991,16 @@ msgstr "選擇開機設備"
 
 #. Tag: para
 #: preparing.xml:1265
-#, no-c-format
+#, fuzzy, 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 "
@@ -1883,7 +2008,7 @@ msgid ""
 "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."
+"which are the two most common boot devices used to install &debian;."
 msgstr ""
 "許多 BIOS 的設定選單都能讓您選擇啟動系統的設備。讓它先在 <filename>A:</"
 "filename> (第一個軟碟機) 中找尋可開機的作業系統，不行的話，再在到第一個光碟機"
@@ -2490,11 +2615,12 @@ msgid ""
 "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."
+"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 ""
 "在真正進行安裝之前，您必須仔細檢查一些設計和準備步驟。IBM 已經有整個過程的文"
 "件，例如，如何準備安裝媒介和如何從該媒介開機。我們無須在此複製那些資料。但我"
diff --git a/po/zh_TW/random-bits.po b/po/zh_TW/random-bits.po
index 1e71d5bde..04e9c683a 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -799,7 +799,16 @@ msgstr "透過 Unix/Linux 系統來安裝 &debian-gnu;"
 
 #. Tag: para
 #: random-bits.xml:360
-#, no-c-format
+#, fuzzy, 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, Mandrake, 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 "
@@ -808,7 +817,7 @@ msgid ""
 "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."
+"<prompt>#</prompt> refers to a command entered in the &debian; chroot."
 msgstr ""
 "本節說明了如何透過現有的 Unix 或 Linux 系統來安裝 &debian-gnu;，而非使用本手"
 "冊後面要談到的基於 ncurses，由選單驅動的安裝軟體。這篇<quote>交叉安裝(cross-"
@@ -820,13 +829,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:372
-#, 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."
+#, fuzzy, 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 系統，就可以將您的原來系統中的使用者"
 "資料(如果有的話)全部遷移到 Debian 裡去。然後就能繼續爽了。一言以蔽之，這是一"
@@ -839,7 +854,7 @@ msgstr ""
 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 "
+"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 "
@@ -890,7 +905,7 @@ msgstr ""
 #, fuzzy, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
-"intended Debian swap partition): <informalexample><screen>\n"
+"intended &debian; swap partition): <informalexample><screen>\n"
 "# mkswap /dev/<replaceable>hda5</replaceable>\n"
 "# sync; sync; sync\n"
 "# swapon /dev/<replaceable>hda5</replaceable>\n"
@@ -937,15 +952,15 @@ msgstr "安裝 <command>debootstrap</command>"
 #: random-bits.xml:442
 #, fuzzy, 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>."
+"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 ""
 "Debian 安裝程式使用的軟體，同時也為官方所採用，被用來安裝基系統的工具是 "
 "<command>debootstrap</command>。它使用了 <command>wget</command> 和 "
@@ -962,7 +977,7 @@ msgid ""
 "# 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 "
+"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. "
@@ -1001,7 +1016,7 @@ msgstr "執行 <command>debootstrap</command>"
 #, fuzzy, 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 "
+"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>."
@@ -1064,11 +1079,11 @@ msgstr "基本系統的設定"
 #: random-bits.xml:535
 #, no-c-format
 msgid ""
-"Now you've got a real Debian system, though rather lean, on disk. "
+"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:"
+"definition to be compatible with the &debian; base system, for example:"
 msgstr ""
 
 #. Tag: screen
@@ -1167,7 +1182,7 @@ msgid ""
 "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 "
+"</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"
@@ -1487,7 +1502,7 @@ 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."
+"can use <command>aptitude</command> inside your &debian; chroot to do so."
 msgstr ""
 "要讓您的 &debian-gnu; 系統能夠啟動，還要設定您的 boot loader，好讓它能已安裝"
 "的核心並用上新的根分割區。注意 debootstrap 不會安裝 boot loader， 因此您要在 "
@@ -1499,8 +1514,8 @@ msgstr ""
 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 "
+"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 "
@@ -1568,11 +1583,19 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:787
-#, no-c-format
+#, fuzzy, 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, "
-"just add an entry for the Debian install to your existing <filename>yaboot."
+"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)."
@@ -1661,7 +1684,8 @@ 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)."
+"connected to a network that has a &debian; mirror on it (e.g. to the "
+"Internet)."
 msgstr ""
 
 #. Tag: para
@@ -1704,8 +1728,8 @@ msgstr ""
 #: random-bits.xml:875
 #, no-c-format
 msgid ""
-"A target computer, called <emphasis>target</emphasis>, where Debian will be "
-"installed."
+"A target computer, called <emphasis>target</emphasis>, where &debian; will "
+"be installed."
 msgstr ""
 
 #. Tag: para
@@ -2030,7 +2054,7 @@ msgstr ""
 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 "
+"<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."
@@ -2042,7 +2066,7 @@ msgstr ""
 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="
+"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."
diff --git a/po/zh_TW/using-d-i.po b/po/zh_TW/using-d-i.po
index e8fe2aba8..4d0c4f86a 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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -14,8 +14,9 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:5
-#, no-c-format
-msgid "Using the Debian Installer"
+#, fuzzy, no-c-format
+#| msgid "Using the Debian Installer"
+msgid "Using the &debian; Installer"
 msgstr "使用 Debian 安裝程式"
 
 #. Tag: title
@@ -26,9 +27,15 @@ msgstr "安裝程式如何運作"
 
 #. Tag: para
 #: using-d-i.xml:8
-#, no-c-format
+#, fuzzy, 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 "
+"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 "
@@ -327,8 +334,9 @@ msgstr "cdrom-detect"
 
 #. Tag: para
 #: using-d-i.xml:185
-#, no-c-format
-msgid "Looks for and mounts a Debian installation CD."
+#, fuzzy, no-c-format
+#| msgid "Looks for and mounts a Debian installation CD."
+msgid "Looks for and mounts a &debian; installation CD."
 msgstr "尋找並掛載 Debian 安裝光碟。"
 
 #. Tag: term
@@ -366,10 +374,13 @@ msgstr "choose-mirror"
 
 #. Tag: para
 #: using-d-i.xml:210
-#, no-c-format
+#, fuzzy, 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."
+"Presents a list of &debian; archive mirrors. The user may choose the source "
+"of his installation packages."
 msgstr "列出 Debian 軟體套件鏡像。使用者可以選擇從哪裡安裝軟體套件。"
 
 #. Tag: term
@@ -451,12 +462,17 @@ msgstr "partman"
 
 #. Tag: para
 #: using-d-i.xml:264
-#, no-c-format
+#, fuzzy, 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."
+"support. This is the preferred partitioning tool in &debian;."
 msgstr ""
 "讓使用者為系統安排磁碟分割區，建立檔案系統，並分配掛載點。它包括一些有趣的功"
 "能，如自動模式或 LVM 支援。在 Debian 裡這是建議的分割工具。"
@@ -639,7 +655,7 @@ msgstr "save-logs"
 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."
+"accurately report installer software problems to &debian; developers later."
 msgstr ""
 "當使用者遇到麻煩時，提供記錄資訊到軟碟的方法，用於以後向 Debian 開發人員精確"
 "報告安裝程式的問題。"
@@ -667,15 +683,26 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:412
-#, no-c-format
-msgid "Setting up Debian Installer and Hardware Configuration"
+#, fuzzy, 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 "
+#, fuzzy, 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 "
 "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 "
@@ -845,7 +872,7 @@ msgstr ""
 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 "
+"&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 ""
@@ -1009,18 +1036,24 @@ msgstr ""
 
 #. Tag: title
 #: using-d-i.xml:675
-#, no-c-format
-msgid "Looking for the Debian Installer ISO Image"
+#, fuzzy, 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
+#, fuzzy, 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."
+"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> "
@@ -1028,7 +1061,21 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:683
-#, no-c-format
+#, fuzzy, 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 "
@@ -1039,9 +1086,9 @@ msgid ""
 "<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."
+"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> 自動掛載具有已知檔案系統的資料塊 (block) 設"
 "備 (例如，分割區)，然後按序搜索檔案副檔名是 <filename>.iso</filename> (或 "
@@ -1790,13 +1837,19 @@ msgstr "分割區方式"
 
 #. Tag: para
 #: using-d-i.xml:1219
-#, no-c-format
+#, fuzzy, 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."
+"and the usage of partitions by your new &debian; system will be covered in "
+"the remainder of this section."
 msgstr ""
 "如果您選擇了手動分割區的話，它的畫面和上面介紹的嚮導式分割區大體上相同。不同"
 "之處在於，畫面上顯示的是您目前的分割區列表，而且其中並沒有掛載點的資訊。關於"
@@ -3555,13 +3608,19 @@ msgstr "偵測其他的作業系統"
 
 #. Tag: para
 #: using-d-i.xml:2595
-#, no-c-format
+#, fuzzy, 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."
+"other operating system in addition to &debian;."
 msgstr ""
 "在啟動開機器安裝之前，安裝程式會試著偵測已經安裝到電腦上的其他作業系統。如果"
 "它找到支援的作業系統，您將在啟動開機器安裝步驟裡得到提示，與 Debian 一起，電"
@@ -3708,17 +3767,22 @@ msgstr "這種方式 <command>LILO</command> 將完全控制開機過程。"
 
 #. Tag: term
 #: using-d-i.xml:2704
-#, no-c-format
-msgid "new Debian partition"
+#, fuzzy, no-c-format
+#| msgid "new Debian partition"
+msgid "new &debian; partition"
 msgstr "新 Debian 分割區"
 
 #. Tag: para
 #: using-d-i.xml:2704
-#, no-c-format
+#, fuzzy, 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."
+"will install itself at the beginning of the new &debian; partition and it "
+"will serve as a secondary boot loader."
 msgstr ""
 "如果您想使用其它 boot-loader，選擇此方式。<command>LILO</command> 將安裝到新 "
 "Debian 分割區的起始位置，並能作為第二 boot loader。"
@@ -3752,7 +3816,7 @@ msgid ""
 "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!"
+"&debian;!"
 msgstr ""
 "如果您在此步之後無法啟動 Windows 9x (或 DOS)，您需要使用 Windows 9x (MS-DOS) "
 "開機磁片，並用 <userinput>fdisk /mbr</userinput> 指令重新安裝 MS-DOS 開機檔"
@@ -3884,10 +3948,15 @@ msgstr "elilo.efi"
 
 #. Tag: para
 #: using-d-i.xml:2821
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""
@@ -3903,11 +3972,17 @@ msgstr "initrd.img"
 
 #. Tag: para
 #: using-d-i.xml:2832
-#, no-c-format
+#, fuzzy, 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</"
+"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</"
@@ -3939,12 +4014,17 @@ msgstr "vmlinuz"
 
 #. Tag: para
 #: using-d-i.xml:2856
-#, no-c-format
+#, fuzzy, 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>."
+"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> 符號鏈結 "
@@ -4200,7 +4280,7 @@ msgstr "完成安裝並重開機"
 #: using-d-i.xml:3053
 #, fuzzy, no-c-format
 msgid ""
-"This is the last step in the Debian installation process during which the "
+"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; 之後的整理。"
@@ -4254,7 +4334,7 @@ msgstr "安裝基本系統"
 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."
+"new &debian; system."
 msgstr ""
 "這是安裝 Debian 程序的最後一步。您會被提醒取出用於啟動安裝程式的媒介 (CD，軟"
 "碟等)。安裝程式將完成最後的工作，然後啟動您的新 Debian 系統。"
@@ -4301,7 +4381,7 @@ msgstr "保存安裝記錄"
 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."
+"installer/</filename> on your new &debian; system."
 msgstr ""
 "如果安裝成功，安裝過程中建立的記錄檔會被自動儲存到您新的 Debian 系統上的 "
 "<filename>/var/log/debian-installer/</filename>。"
diff --git a/po/zh_TW/welcome.po b/po/zh_TW/welcome.po
index 0b53b76c2..2891caf47 100644
--- a/po/zh_TW/welcome.po
+++ b/po/zh_TW/welcome.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-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+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"
@@ -14,17 +14,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "歡迎使用 Debian"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, 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."
+"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; 發行套件有一定的瞭解，您可略過本章。"
@@ -351,17 +356,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, 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
+#, fuzzy, 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 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 "
+"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 "
@@ -379,9 +396,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, 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, "
+"&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."
@@ -392,12 +414,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debian 在進階使用者中非常流行的原因在於它具有優秀的技術， 而且它對 Linux 的深"
 "入貢獻滿足了社群的需求與期望。 現今，Debian 為 Linux 引入的許多特色已經成為非"
@@ -405,9 +432,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, 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 "
+"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."
@@ -417,9 +449,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, 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 "
+"&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."
@@ -429,11 +466,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, 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 "
-"Debian system complete control over the packages installed on that system, "
+"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 "
@@ -446,15 +492,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, 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 "
-"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."
+"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."
 msgstr ""
 "為了提防<quote>特洛伊木馬</quote>和其他惡意軟體以保護您的系統，Debian 伺服器"
 "會驗證由在 Debian 註冊的維護人員所上傳的軟體套件。 Debian 的套件打包人員也會"
@@ -464,15 +518,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "為您的 Debian GNU/Linux 系統尋求技術支援和聯絡 Debian 開發人員，最主要、也是"
 "最好的方法是透過 Debian 計畫的通信論壇 (撰寫本文時已有&num-of-debian-"
@@ -484,28 +546,40 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "什麼是 Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, 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."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Debian GNU/Hurd 是將 Debian GNU 系統中 Linux 單核心替換為 GNU Hurd &mdash; 運"
+"行在 GNU Mach 微核心上的一組伺服器程式。Hurd 還沒有完成，不適合日常應用，但仍"
+"在開發當中。Hurd 目前僅為 i386 架構開發，不過當系統穩定之後也會移植到其他的硬"
+"體架構下。"
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -518,7 +592,7 @@ msgstr ""
 #| "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 "
+"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/hurd/\">Debian GNU/Hurd 移植"
@@ -527,16 +601,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "什麼是 Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 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."
+"&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 ""
 
 #. Tag: para
@@ -564,16 +639,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, 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; 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 移植"
@@ -582,19 +661,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "取得 Debian"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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."
+"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;\">發行網頁</ulink>。<ulink url=\"&url-"
@@ -603,9 +689,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, 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 "
+"&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 ""
@@ -641,24 +731,34 @@ msgstr "本文架構"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, 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."
+"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 ""
 "本文件意在成為 Deiban 新手的使用手冊。儘管它已經盡量對您的的專業知識水平做最"
 "少的假設，但我們還是假設您對電腦硬體的工作方式有基本的瞭解。"
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, 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."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "專業使用者也可以在本手冊中找到一些有趣的參考資訊，包括最小安裝所需的空間，"
 "Debian 安裝程式支援的硬體細節等等。我們鼓勵專業使用者選擇性的瀏覽本文件。"
@@ -686,12 +786,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, 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."
+"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\"/>。如果您需要多重開機於不同的作業系統，您可能需要為 "
@@ -721,10 +826,10 @@ 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 "
+"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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "請根據 <xref linkend=\"d-i-intro\"/>來進行真正的安裝動作。這其中涉及選擇語"
@@ -744,11 +849,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, 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."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "當系統安裝完成，您可以閱讀 <xref linkend=\"post-install\"/>。該章節將解釋在哪"
 "裡尋找更多有關 Unix 和 Debian 的資訊，以及如何更換您的核心。"
@@ -825,7 +934,7 @@ msgid ""
 "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>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "我們相信您曾經閱讀過一些商業軟體的授權 &mdash; 它們通常要求您只能在一台電腦上"
 "使用一份軟體拷貝。本系統所使用的授權與它們完全不同。我們鼓勵您在學校或商業機"
@@ -853,16 +962,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, 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 "
+"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."
+"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."
 msgstr ""
 "Debian 計畫考慮到對使用者的實用性，也有不符合我們自由規範的軟體套件存在。這些"
 "軟體套件不屬於官方發行套件，只存在於 <userinput>contrib</userinput> 或 "
@@ -872,7 +990,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, 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 "
@@ -881,10 +1011,10 @@ msgid ""
 "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 "
+"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."
+"such programs is available in the &debian; system."
 msgstr ""
 "系統中很多軟體所使用的許可證是 <emphasis>GNU</emphasis> <emphasis>General "
 "Public License(通用公共許可證)</emphasis>，通常簡稱為 <quote>GPL</quote>。"
@@ -897,13 +1027,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, 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."
+"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/"
@@ -912,9 +1048,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, 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 "
+"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 ""