29 files changed, 74 insertions, 184 deletions
diff --git a/ca/preparing/minimum-hardware-reqts.xml b/ca/preparing/minimum-hardware-reqts.xml
index f8bac62ae..89f66be25 100644
--- a/ca/preparing/minimum-hardware-reqts.xml
+++ b/ca/preparing/minimum-hardware-reqts.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 65193 -->
+<!-- original version: 68697 -->
 
  <sect1 id="minimum-hardware-reqts">
 <title>Satisfer els requisits mínims de maquinari</title>
diff --git a/cs/preparing/minimum-hardware-reqts.xml b/cs/preparing/minimum-hardware-reqts.xml
index 47fa5042b..c7fd8c940 100644
--- a/cs/preparing/minimum-hardware-reqts.xml
+++ b/cs/preparing/minimum-hardware-reqts.xml
@@ -1,5 +1,5 @@
 <!-- $Id$ -->
-<!-- original version: 65193 -->
+<!-- original version: 68697 -->
 
  <sect1 id="minimum-hardware-reqts">
 <title>Splnění minimálních hardwarových požadavků</title>
diff --git a/de/preparing/minimum-hardware-reqts.xml b/de/preparing/minimum-hardware-reqts.xml
index f8e616104..26999829e 100644
--- a/de/preparing/minimum-hardware-reqts.xml
+++ b/de/preparing/minimum-hardware-reqts.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 65193 -->
+<!-- original version: 68697 -->
 
  <sect1 id="minimum-hardware-reqts">
 <title>Minimale Hardware-Anforderungen</title>
diff --git a/fr/preparing/minimum-hardware-reqts.xml b/fr/preparing/minimum-hardware-reqts.xml
index 7d48f44d8..93480326f 100644
--- a/fr/preparing/minimum-hardware-reqts.xml
+++ b/fr/preparing/minimum-hardware-reqts.xml
@@ -1,4 +1,4 @@
-<!-- original version: 65193 -->
+<!-- original version: 68697 -->
 
  <sect1 id="minimum-hardware-reqts">
 <title>Matériel minimum</title>
diff --git a/it/preparing/minimum-hardware-reqts.xml b/it/preparing/minimum-hardware-reqts.xml
index bdd4a1421..672a4813d 100644
--- a/it/preparing/minimum-hardware-reqts.xml
+++ b/it/preparing/minimum-hardware-reqts.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 65193 -->
+<!-- original version: 68697 -->
 
  <sect1 id="minimum-hardware-reqts">
  <!-- <title>Meeting Minimum Hardware Requirements</title> -->
diff --git a/po/da/preparing.po b/po/da/preparing.po
index acb7458aa..834aa74d0 100644
--- a/po/da/preparing.po
+++ b/po/da/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+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"
@@ -1007,7 +1007,7 @@ msgstr ""
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/el/preparing.po b/po/el/preparing.po
index 9ffb896ad..d7b1337e2 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: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+0000\n"
 "PO-Revision-Date: 2013-05-01 17:07+0300\n"
 "Last-Translator: galaxico <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -1274,7 +1274,7 @@ msgstr "5 gigabytes"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/es/preparing.po b/po/es/preparing.po
index 5606b471e..b0e988b3b 100644
--- a/po/es/preparing.po
+++ b/po/es/preparing.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+0000\n"
 "PO-Revision-Date: 2013-03-08 12:08+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1284,7 +1284,7 @@ msgstr "5 Gigabytes"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/fi/preparing.po b/po/fi/preparing.po
index aae067663..d7a0354c1 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: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+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"
@@ -1195,7 +1195,7 @@ msgstr "5 gigatavua"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/hu/preparing.po b/po/hu/preparing.po
index 138393332..1dc2cfe63 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: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+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"
@@ -1187,7 +1187,7 @@ msgstr "5 gigabájt"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/ja/preparing.po b/po/ja/preparing.po
index fb0430a8f..02ca8e30a 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: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+0000\n"
 "PO-Revision-Date: 2013-04-08 23:08+0900\n"
 "Last-Translator: KURASAWA Nozomu (nabetaro) <nabetaro@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1129,7 +1129,7 @@ msgstr "5 ギガバイト"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/ko/preparing.po b/po/ko/preparing.po
index a5cf64af0..3b1d82912 100644
--- a/po/ko/preparing.po
+++ b/po/ko/preparing.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+0000\n"
 "PO-Revision-Date: 2013-01-27 05:58+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -1190,7 +1190,7 @@ msgstr "5기가바이트"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/nl/preparing.po b/po/nl/preparing.po
index acb7458aa..834aa74d0 100644
--- a/po/nl/preparing.po
+++ b/po/nl/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+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"
@@ -1007,7 +1007,7 @@ msgstr ""
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/nn/preparing.po b/po/nn/preparing.po
index acb7458aa..834aa74d0 100644
--- a/po/nn/preparing.po
+++ b/po/nn/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+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"
@@ -1007,7 +1007,7 @@ msgstr ""
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/pot/preparing.pot b/po/pot/preparing.pot
index 0ef9e4018..aaa77d2ed 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: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+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"
@@ -791,7 +791,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:785
 #, no-c-format
-msgid "The actual minimum memory requirements are a lot less then the numbers listed in this table. Depending on the architecture, it is possible to install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The same goes for the disk space requirements, especially if you pick and choose which applications to install; see <xref linkend=\"tasksel-size-list\"/> for additional information on disk space requirements."
+msgid "The actual minimum memory requirements are a lot less than the numbers listed in this table. Depending on the architecture, it is possible to install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The same goes for the disk space requirements, especially if you pick and choose which applications to install; see <xref linkend=\"tasksel-size-list\"/> for additional information on disk space requirements."
 msgstr ""
 
 #. Tag: para
diff --git a/po/pt/boot-new.po b/po/pt/boot-new.po
index 0a1f2893c..dd21c5f42 100644
--- a/po/pt/boot-new.po
+++ b/po/pt/boot-new.po
@@ -510,19 +510,6 @@ msgstr ""
 #. Tag: para
 #: boot-new.xml:282
 #, no-c-format
-#| msgid ""
-#| "If any volume holding noncritical system files could not be mounted "
-#| "(<filename>/usr</filename> or <filename>/var</filename>), the system "
-#| "should still boot and you should be able to mount the volumes manually "
-#| "like in the previous case. However, you will also need to (re)start any "
-#| "services usually running in your default runlevel because it is very "
-#| "likely that they were not started. The easiest way to achieve this is by "
-#| "switching to the first runlevel and back by entering "
-#| "<informalexample><screen>\n"
-#| "<prompt>#</prompt> <userinput>init 1</userinput>\n"
-#| "</screen></informalexample> at the shell prompt and pressing <keycombo> "
-#| "<keycap>Control</keycap> <keycap>D</keycap> </keycombo> when asked for "
-#| "the root password."
 msgid ""
 "If any volume holding noncritical system files could not be mounted "
 "(<filename>/usr</filename> or <filename>/var</filename>), the system should "
@@ -533,9 +520,9 @@ msgid ""
 msgstr ""
 "Se qualquer volume que contenha ficheiros não-críticos de sistema não puder "
 "ser montado (<filename>/usr</filename> ou <filename>/var</filename>), o "
-"sistema deve mesmo assim arrancar e você deve conseguir montar manualmente os "
-"volumes tal como no caso anterior. No entanto, também irá necessitar "
-"(re)iniciar quaisquer serviços que correm normalmente no seu runlevel "
+"sistema deve mesmo assim arrancar e você deve conseguir montar manualmente "
+"os volumes tal como no caso anterior. No entanto, também irá necessitar (re)"
+"iniciar quaisquer serviços que correm normalmente no seu runlevel "
 "predefinido porque é muito provável que estes não tenham iniciado. A forma "
 "mais simples é reiniciar o computador."
 
diff --git a/po/pt/hardware.po b/po/pt/hardware.po
index 284d7699f..7bc0d6e33 100644
--- a/po/pt/hardware.po
+++ b/po/pt/hardware.po
@@ -935,10 +935,6 @@ msgstr "<term>powerpc</term>"
 #. Tag: para
 #: hardware.xml:601
 #, no-c-format
-#| msgid ""
-#| "Most systems use this kernel flavour, which supports the PowerPC 601, "
-#| "603, 604, 740, 750, and 7400 processors. All Apple PowerMac machines up "
-#| "to and including the one marketed as G4 use one of these processors."
 msgid ""
 "This kernel flavour supports the PowerPC 601, 603, 604, 740, 750, and 7400 "
 "processors. All Apple PowerMac machines up to and including the one marketed "
@@ -998,9 +994,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:636
 #, no-c-format
-#| msgid ""
-#| "Systems using the Apple G5 (PPC970FX processor) are also based on the "
-#| "POWER4 architecture, and use this kernel flavour."
 msgid ""
 "Systems using the PPC970 processor (Apple G5, YDL PowerStation, IBM "
 "Intellistation POWER 185) are also based on the POWER4 architecture, and use "
@@ -1014,7 +1007,8 @@ msgstr ""
 #: hardware.xml:642
 #, no-c-format
 msgid "Newer IBM systems using POWER5, POWER6, and POWER7 processors."
-msgstr "Os sistemas IBM mais recentes com processadores POWER5, POWER6 e POWER7."
+msgstr ""
+"Os sistemas IBM mais recentes com processadores POWER5, POWER6 e POWER7."
 
 #. Tag: title
 #: hardware.xml:675
diff --git a/po/pt/install-methods.po b/po/pt/install-methods.po
index ea58a76fc..2567795c3 100644
--- a/po/pt/install-methods.po
+++ b/po/pt/install-methods.po
@@ -81,19 +81,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:38
 #, no-c-format
-#| msgid ""
-#| "If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
-#| "relevant on very old PC systems)</phrase>, 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<phrase arch=\"x86\"> (only "
 "relevant on very old PC systems)</phrase>, but you do have a CD set, you can "
@@ -113,14 +100,14 @@ msgstr ""
 "conjunto de CDs, pode utilizar uma estratégia alternativa tal como uma "
 "<phrase condition=\"supports-floppy-boot\">disquete,</phrase> <phrase arch="
 "\"s390\">VM reader, </phrase> <phrase condition=\"bootable-disk\">disco "
-"rígido,</phrase> <phrase condition=\"bootable-usb\">pen usb,</phrase> <phrase "
-"condition=\"supports-tftp\">net boot,</phrase> ou carregar manualmente o "
-"kernel a partir do CD para iniciar o instalador de sistema. Os ficheiros que "
-"necessita para arrancar através de outros métodos também estão no CD; A "
-"organização do arquivo &debian; é idêntica à organização de ficheiros do CD. "
-"Portanto quando abaixo forem dadas localizações para ficheiros específicos "
-"necessários para o arranque, procure por esses ficheiros nos mesmos "
-"directórios e sub-directórios do seu CD."
+"rígido,</phrase> <phrase condition=\"bootable-usb\">pen usb,</phrase> "
+"<phrase condition=\"supports-tftp\">net boot,</phrase> ou carregar "
+"manualmente o kernel a partir do CD para iniciar o instalador de sistema. Os "
+"ficheiros que necessita para arrancar através de outros métodos também estão "
+"no CD; A organização do arquivo &debian; é idêntica à organização de "
+"ficheiros do CD. Portanto quando abaixo forem dadas localizações para "
+"ficheiros específicos necessários para o arranque, procure por esses "
+"ficheiros nos mesmos directórios e sub-directórios do seu CD."
 
 #. Tag: para
 #: install-methods.xml:61
@@ -135,14 +122,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:66
 #, no-c-format
-#| msgid ""
-#| "If you don't have a CD set, then you will need to download the installer "
-#| "system files and place them on the <phrase arch=\"s390\">installation "
-#| "tape</phrase> <phrase condition=\"supports-floppy-boot\">floppy disk or</"
-#| "phrase> <phrase condition=\"bootable-disk\">hard disk or</phrase> <phrase "
-#| "condition=\"bootable-usb\">usb stick or</phrase> <phrase condition="
-#| "\"supports-tftp\">a connected computer</phrase> so they can be used to "
-#| "boot the installer."
 msgid ""
 "If you don't have a CD set, then you will need to download the installer "
 "system files and place them on the <phrase arch=\"s390\">VM minidisk</"
@@ -151,14 +130,13 @@ msgid ""
 "\"bootable-usb\">usb stick or</phrase> <phrase condition=\"supports-tftp\">a "
 "connected computer</phrase> so they can be used to boot the installer."
 msgstr ""
-"Se não tiver um conjunto de CDs, então terá de fazer o download dos ficheiros "
-"do sistema de instalação e colocá-los na "
-"<phrase arch=\"s390\">VM minidisk</phrase> "
-"<phrase condition=\"supports-floppy-boot\">disquete ou</phrase> "
-"<phrase condition=\"bootable-disk\"> no disco rígido ou</phrase> "
-"<phrase condition=\"bootable-usb\">numa pen usb ou</phrase> "
-"<phrase condition=\"supports-tftp\">num computador na rede</phrase> "
-"para que possam ser utilizados para arrancar o instalador."
+"Se não tiver um conjunto de CDs, então terá de fazer o download dos "
+"ficheiros do sistema de instalação e colocá-los na <phrase arch=\"s390\">VM "
+"minidisk</phrase> <phrase condition=\"supports-floppy-boot\">disquete ou</"
+"phrase> <phrase condition=\"bootable-disk\"> no disco rígido ou</phrase> "
+"<phrase condition=\"bootable-usb\">numa pen usb ou</phrase> <phrase "
+"condition=\"supports-tftp\">num computador na rede</phrase> para que possam "
+"ser utilizados para arrancar o instalador."
 
 #. Tag: title
 #: install-methods.xml:92
@@ -2147,16 +2125,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:1300
 #, no-c-format
-#| msgid ""
-#| "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
-#| "easy, because it treats BOOTP clients as a moderately special case of "
-#| "DHCP clients. Some architectures require a complex configuration for "
-#| "booting clients via BOOTP. If yours is one of those, read the section "
-#| "<xref linkend=\"dhcpd\"/>. Otherwise you will probably be able to get "
-#| "away with simply adding the <userinput>allow bootp</userinput> directive "
-#| "to the configuration block for the subnet containing the client in "
-#| "<filename>/etc/dhcp3/dhcpd.conf</filename>, and restart <command>dhcpd</"
-#| "command> with <userinput>/etc/init.d/isc-dhcp-server restart</userinput>."
 msgid ""
 "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
 "easy, because it treats BOOTP clients as a moderately special case of DHCP "
@@ -2171,12 +2139,13 @@ msgstr ""
 "Por contraste, configurar BOOTP com o ISC <command>dhcpd</command> é "
 "realmente fácil, pois trata os clientes de BOOTP como casos moderadamente "
 "especiais de clientes de DHCP. Algumas arquitecturas necessitam duma "
-"configuração complexa para arrancarem os clientes por BOOTP. Se for um desses "
-"casos, leia a secção <xref linkend=\"dhcpd\"/>. Caso contrário poderá ser "
-"capaz de o conseguir simplesmente acrescentando a directiva <userinput>allow "
-"bootp</userinput> ao bloco de configuração para a subnet que contém o cliente "
-"em <filename>/etc/dhcp/dhcpd.conf</filename>, e reiniciar o <command>dhcpd"
-"</command> com <userinput>/etc/init.d/isc-dhcp-server restart</userinput>."
+"configuração complexa para arrancarem os clientes por BOOTP. Se for um "
+"desses casos, leia a secção <xref linkend=\"dhcpd\"/>. Caso contrário poderá "
+"ser capaz de o conseguir simplesmente acrescentando a directiva "
+"<userinput>allow bootp</userinput> ao bloco de configuração para a subnet "
+"que contém o cliente em <filename>/etc/dhcp/dhcpd.conf</filename>, e "
+"reiniciar o <command>dhcpd</command> com <userinput>/etc/init.d/isc-dhcp-"
+"server restart</userinput>."
 
 #. Tag: title
 #: install-methods.xml:1319
diff --git a/po/pt/partitioning.po b/po/pt/partitioning.po
index b9c15e1ed..45a2b0f41 100644
--- a/po/pt/partitioning.po
+++ b/po/pt/partitioning.po
@@ -277,14 +277,12 @@ msgstr "Directório home do utilizador root"
 #. Tag: filename
 #: partitioning.xml:118
 #, no-c-format
-#| msgid "<filename>bin</filename>"
 msgid "<filename>run</filename>"
 msgstr "<filename>run</filename>"
 
 #. Tag: entry
 #: partitioning.xml:119
 #, no-c-format
-#| msgid "Variable data"
 msgid "Run-time variable data"
 msgstr "Dados de execução variáveis"
 
diff --git a/po/pt/preparing.po b/po/pt/preparing.po
index 7b4a4bc70..431dceca6 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: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+0000\n"
 "PO-Revision-Date: 2013-05-25 09:12+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <kde-i18n-doc@kde.org>\n"
@@ -1248,7 +1248,7 @@ msgstr "5 gigabytes"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
@@ -2132,14 +2132,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1367
 #, no-c-format
-#| msgid ""
-#| "Linux on this platform runs either natively on the bare machine, in a so-"
-#| "called LPAR (Logical Partition) or in a virtual machine supplied by the "
-#| "VM system. You can use a boot tape on all of those systems; you may use "
-#| "some other boot media, too, but those may not be generally available. For "
-#| "example, you can use the virtual card reader of a virtual machine, or "
-#| "boot from the HMC (Hardware Management Console) of an LPAR if the HMC and "
-#| "this option is available for you."
 msgid ""
 "Linux on this platform runs either natively on the bare machine, in a so-"
 "called LPAR (Logical Partition) or in a virtual machine supplied by the VM "
@@ -2150,10 +2142,10 @@ msgid ""
 msgstr ""
 "Nesta plataforma Linux corre quer nativamente directamente na máquina, numa "
 "chamado LPAR (Partição Lógica) ou numa máquina virtual disponibilizada pelo "
-"sistema VM. O meio de arranque depende do modo de execução. Por exemplo, pode "
-"utilizar o leitor de cartões virtual de uma máquina virtual, ou arrancar a "
-"partir da HMC (Hardware Management Console) de uma LPAR se o HMC e esta opção "
-"estiverem disponíveis para si."
+"sistema VM. O meio de arranque depende do modo de execução. Por exemplo, "
+"pode utilizar o leitor de cartões virtual de uma máquina virtual, ou "
+"arrancar a partir da HMC (Hardware Management Console) de uma LPAR se o HMC "
+"e esta opção estiverem disponíveis para si."
 
 #. Tag: para
 #: preparing.xml:1376
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index acdb0b301..e4a4767ac 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -197,7 +197,6 @@ msgstr "baseado em disquete (net-drivers)"
 #. Tag: entry
 #: preseed.xml:108
 #, no-c-format
-#| msgid "generic/tape"
 msgid "generic"
 msgstr "genérico"
 
@@ -2579,34 +2578,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:1035
 #, no-c-format
-#| msgid ""
-#| "# You can choose to install non-free and contrib software.\n"
-#| "#d-i apt-setup/non-free boolean true\n"
-#| "#d-i apt-setup/contrib boolean true\n"
-#| "# Uncomment this if you don't want to use a network mirror.\n"
-#| "#d-i apt-setup/use_mirror boolean false\n"
-#| "# Select which update services to use; define the mirrors to be used.\n"
-#| "# Values shown below are the normal defaults.\n"
-#| "#d-i apt-setup/services-select multiselect security, volatile\n"
-#| "#d-i apt-setup/security_host string security.debian.org\n"
-#| "#d-i apt-setup/volatile_host string volatile.debian.org\n"
-#| "\n"
-#| "# Additional repositories, local[0-9] available\n"
-#| "#d-i apt-setup/local0/repository string \\\n"
-#| "#       http://local.server/debian stable main\n"
-#| "#d-i apt-setup/local0/comment string local server\n"
-#| "# Enable deb-src lines\n"
-#| "#d-i apt-setup/local0/source boolean true\n"
-#| "# URL to the public key of the local repository; you must provide a key "
-#| "or\n"
-#| "# apt will complain about the unauthenticated repository and so the\n"
-#| "# sources.list line will be left commented out\n"
-#| "#d-i apt-setup/local0/key string http://local.server/key\n"
-#| "\n"
-#| "# By default the installer requires that repositories be authenticated\n"
-#| "# using a known gpg key. This setting can be used to disable that\n"
-#| "# authentication. Warning: Insecure, not recommended.\n"
-#| "#d-i debian-installer/allow_unauthenticated boolean true"
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
 "#d-i apt-setup/non-free boolean true\n"
diff --git a/po/pt/using-d-i.po b/po/pt/using-d-i.po
index 4797de0a6..6a359be0c 100644
--- a/po/pt/using-d-i.po
+++ b/po/pt/using-d-i.po
@@ -3885,13 +3885,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:2329
 #, no-c-format
-#| msgid ""
-#| "If you are installing at default priority, the installer will largely "
-#| "take care of the configuration automatically, based on the installation "
-#| "method you are using and possibly using choices made earlier in the "
-#| "installation. In most cases the installer will automatically add a "
-#| "security mirror and, if you are installing the stable distribution, a "
-#| "mirror for the <quote>volatile</quote> update service."
 msgid ""
 "If you are installing at default priority, the installer will largely take "
 "care of the configuration automatically, based on the installation method "
@@ -3911,12 +3904,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:2338
 #, no-c-format
-#| msgid ""
-#| "If you are installing at a lower priority (e.g. in expert mode), you will "
-#| "be able to make more decisions yourself. You can choose whether or not to "
-#| "use the security and/or volatile update services, and you can choose to "
-#| "add packages from the <quote>contrib</quote> and <quote>non-free</quote> "
-#| "sections of the archive."
 msgid ""
 "If you are installing at a lower priority (e.g. in expert mode), you will be "
 "able to make more decisions yourself. You can choose whether or not to use "
@@ -4153,10 +4140,6 @@ msgstr "dos quais estão presentes nos CDs ou DVDs que pesquisou, e"
 #. Tag: para
 #: using-d-i.xml:2469
 #, no-c-format
-#| msgid ""
-#| "whether any updated versions of packages included on the CDs or DVDs are "
-#| "available from a mirror (either a regular package mirror, or a mirror for "
-#| "security or volatile updates)."
 msgid ""
 "whether any updated versions of packages included on the CDs or DVDs are "
 "available from a mirror (either a regular package mirror, or a mirror for "
@@ -4169,11 +4152,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:2478
 #, no-c-format
-#| msgid ""
-#| "Note that the last point means that, even if you choose not to use a "
-#| "network mirror, some packages may still be downloaded from the Internet "
-#| "if there is a security or volatile update available for them and those "
-#| "services have been configured."
 msgid ""
 "Note that the last point means that, even if you choose not to use a network "
 "mirror, some packages may still be downloaded from the Internet if there is "
@@ -4182,7 +4160,8 @@ msgid ""
 msgstr ""
 "Note que o último ponto significa que, mesmo que escolha não utilizar um "
 "mirror de rede, alguns pacotes podem mesmo assim ser descarregados da "
-"Internet se estiverem disponíveis actualizações nos serviços security ou stable-updates e se esses serviços tiverem sido configurados."
+"Internet se estiverem disponíveis actualizações nos serviços security ou "
+"stable-updates e se esses serviços tiverem sido configurados."
 
 #. Tag: title
 #: using-d-i.xml:2489
diff --git a/po/ro/preparing.po b/po/ro/preparing.po
index acb7458aa..834aa74d0 100644
--- a/po/ro/preparing.po
+++ b/po/ro/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+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"
@@ -1007,7 +1007,7 @@ msgstr ""
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/ru/preparing.po b/po/ru/preparing.po
index 456df6573..4b59b2a2c 100644
--- a/po/ru/preparing.po
+++ b/po/ru/preparing.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+0000\n"
 "PO-Revision-Date: 2013-03-10 17:00+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1248,7 +1248,7 @@ msgstr "5 гигабайт"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/sv/preparing.po b/po/sv/preparing.po
index ea0f26526..c552df625 100644
--- a/po/sv/preparing.po
+++ b/po/sv/preparing.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation guide 20051025 preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+0000\n"
 "PO-Revision-Date: 2012-07-30 18:24+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -1205,7 +1205,7 @@ msgstr "5 gigabyte"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/tl/preparing.po b/po/tl/preparing.po
index acb7458aa..834aa74d0 100644
--- a/po/tl/preparing.po
+++ b/po/tl/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+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"
@@ -1007,7 +1007,7 @@ msgstr ""
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/vi/preparing.po b/po/vi/preparing.po
index 2d9c059d8..7aa66c4df 100644
--- a/po/vi/preparing.po
+++ b/po/vi/preparing.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+0000\n"
 "PO-Revision-Date: 2012-08-04 05:37+0700\n"
 "Last-Translator: hailang <hailangvn@gmail.com>\n"
 "Language-Team: MOST Project <du-an-most@lists.hanoilug.org>\n"
@@ -1194,7 +1194,7 @@ msgstr "5 GB"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index e31e20ede..bed44a5e6 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: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+0000\n"
 "PO-Revision-Date: 2012-11-26 13:45+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1145,7 +1145,7 @@ msgstr "5 GB"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "
diff --git a/po/zh_TW/preparing.po b/po/zh_TW/preparing.po
index eeeb8594a..a6a5783dc 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: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2013-05-27 08:42+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"
@@ -1105,7 +1105,7 @@ msgstr "1 GB"
 #: preparing.xml:785
 #, no-c-format
 msgid ""
-"The actual minimum memory requirements are a lot less then the numbers "
+"The actual minimum memory requirements are a lot less than the numbers "
 "listed in this table. Depending on the architecture, it is possible to "
 "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
 "same goes for the disk space requirements, especially if you pick and choose "