diff --git a/doc/po/fr.po b/doc/po/fr.po
index 65b0f1e..04b7026 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: multistrap 2.1.4\n"
-"POT-Creation-Date: 2010-08-17 18:39+0200\n"
+"POT-Creation-Date: 2010-08-19 10:39+0200\n"
 "PO-Revision-Date: 2010-05-30 11:24+0100\n"
 "Last-Translator: Alexandre Normand <aj.normand@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "X-Poedit-Bookmarks: 138,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #. type: =head1
@@ -25,7 +25,6 @@ msgstr "Nom"
 #. type: textblock
 #: pod/multistrap:5
 #, fuzzy
-#| msgid "multistrap - debootstrap replacement for multiple repository support"
 msgid "multistrap - multiple repository bootstraps"
 msgstr ""
 "multistrap - Remplacement de debootstrap pour ajouter à debootstrap la "
@@ -116,18 +115,14 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:36
 #, fuzzy
-#| msgid ""
-#| "--sourcedir DIR - move the contents of var/cache/apt/archives/ from "
-#| "inside the chroot to the specified external directory. Same as "
-#| "retainsources=DIR"
 msgid ""
-"--sourcedir DIR - move the contents of var/cache/apt/archives/ from inside "
+"--source-dir DIR - move the contents of var/cache/apt/archives/ from inside "
 "the chroot to the specified external directory, then add the Debian source "
 "packages for each used binary. Same as retainsources=DIR If the specified "
 "directory does not exist, nothing is done. Requires --tidy-up in order to "
 "calculate the full list of source packages, including dependencies."
 msgstr ""
-"--sourcedir DIR - déplace le contenu de var/cache/apt/archives/ de "
+"--source-dir DIR - déplace le contenu de var/cache/apt/archives/ de "
 "l'intérieur du chroot vers le répertoire exterieur spécifié. Identique à "
 "retainsources=DIR"
 
@@ -139,11 +134,6 @@ msgstr "Description"
 #. type: textblock
 #: pod/multistrap:45
 #, fuzzy
-#| msgid ""
-#| "multistrap provides a debootstrap-like method based on apt and extended "
-#| "to provide support for multiple repositories, using a configuration file "
-#| "to specify the relevant suites, architecture, extra packages and the "
-#| "mirror to use for each debootstrap."
 msgid ""
 "multistrap provides a debootstrap-like method based on apt and extended to "
 "provide support for multiple repositories, using a configuration file to "
@@ -173,28 +163,6 @@ msgstr "Exemple de configuration :"
 #. type: verbatim
 #: pod/multistrap:56
 #, fuzzy, no-wrap
-#| msgid ""
-#| " [General]\n"
-#| " arch=armel\n"
-#| " directory=/opt/multistrap/\n"
-#| " # same as --tidy-up option if set to true\n"
-#| " cleanup=true\n"
-#| " # same as --no-auth option if set to true\n"
-#| " # keyring packages listed in each bootstrap will\n"
-#| " # still be installed.\n"
-#| " noauth=false\n"
-#| " # extract all downloaded archives (default is true)\n"
-#| " unpack=true\n"
-#| " # aptsources is a list of sections to be used\n"
-#| " # the /etc/apt/sources.list.d/multistrap.sources.list      \n"
-#| " # of the target. Order is not important\n"
-#| " aptsources=Debian\n"
-#| " # the bootstrap option determines which repository\n"
-#| " # is used to calculate the list of Priority: required packages\n"
-#| " # and which packages go into the rootfs.\n"
-#| " # The order of sections is not important.\n"
-#| " bootstrap=Debian\n"
-#| " \n"
 msgid ""
 " [General]\n"
 " arch=armel\n"
@@ -264,9 +232,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:86
 #, fuzzy
-#| msgid ""
-#| "This will result in a completely normal debootstrap of Debian lenny from "
-#| "the specified mirror, for armel in '/opt/multistrap/'."
 msgid ""
 "This will result in a completely normal debootstrap of Debian lenny from the "
 "specified mirror, for armel in '/opt/multistrap/'. (This configuration is "
@@ -278,9 +243,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:90
 #, fuzzy
-#| msgid ""
-#| "Specify a package to extend the multistrap to include that package and "
-#| "all dependencies."
 msgid ""
 "Specify a package to extend the multistrap to include that package and all "
 "dependencies of that package."
@@ -291,9 +253,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:93
 #, fuzzy
-#| msgid ""
-#| "Specify more bootstraps by adding new sections. Section names are used in "
-#| "the bootstrap general option."
 msgid ""
 "Specify more repositories for the bootstrap by adding new sections.  Section "
 "names need to be listed in the bootstrap general option for the packages to "
@@ -318,12 +277,6 @@ msgstr "La casse des lettres n'est pas importante dans les noms de section."
 #. type: textblock
 #: pod/multistrap:104
 #, fuzzy
-#| msgid ""
-#| "All dependencies are resolved only by apt, using all bootstrap "
-#| "repositories, to use only the most recent and most suitable dependencies. "
-#| "Note that multistrap turns off Install-Recommends so if the multistrap "
-#| "needs a package that is only a Recommended dependency, the recommended "
-#| "package needs to be specified in the packages line explicitly."
 msgid ""
 "All dependencies are resolved only by apt, using all bootstrap repositories, "
 "to use only the most recent and most suitable dependencies. Note that "
@@ -343,17 +296,13 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:112
 #, fuzzy
-#| msgid ""
-#| "'Architecture' and 'directory' can be overridden on the command line.  "
-#| "Other general options have command line options, except debootstrap "
-#| "itself."
 msgid ""
 "'Architecture' and 'directory' can be overridden on the command line.  Some "
 "other general options also have command line options."
 msgstr ""
-"« Architecture » et « directory » peuvent être modifiés en ligne de "
-"commande. D'autres options générales peuvent aussi être indiquées en ligne "
-"de commande, sauf debootstrap."
+"« Architecture » et « directory » peuvent être modifiés en ligne de commande. "
+"D'autres options générales peuvent aussi être indiquées en ligne de "
+"commande, sauf debootstrap."
 
 #. type: =head1
 #: pod/multistrap:115
@@ -418,23 +367,16 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:138
 #, fuzzy
-#| msgid ""
-#| "'directory' specifies the top level directory where the debootstrap will "
-#| "be created - it is not packed into a .tgz once complete."
 msgid ""
 "'directory' specifies the top level directory where the bootstrap will be "
 "created - it is not packed into a .tgz once complete."
 msgstr ""
-"« directory » indique le répertoire de haut niveau dans lequel le "
-"debootstrap sera créé - il n'est pas empaqueté en un .tgz une fois complété."
+"« directory » indique le répertoire de haut niveau dans lequel le debootstrap "
+"sera créé - il n'est pas empaqueté en un .tgz une fois complété."
 
 #. type: textblock
 #: pod/multistrap:141
 #, fuzzy
-#| msgid ""
-#| "C<bootstrap> lists the sections which will be used to create the "
-#| "multistrap itself. Only packages listed in C<bootstrap> will be "
-#| "downloaded and unpacked by multistrap."
 msgid ""
 "'bootstrap' lists the Sections which will be used to specify the packages "
 "which will be downloaded (and optionally unpacked) into the bootstrap."
@@ -467,7 +409,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:154
 #, fuzzy
-#| msgid "As with debootstrap, multistrap will continue after errors."
 msgid ""
 "As with debootstrap, multistrap will continue after errors, as long as the "
 "configuration file can be correctly parsed."
@@ -507,7 +448,6 @@ msgstr ""
 #. type: =head1
 #: pod/multistrap:171
 #, fuzzy
-#| msgid "General settings:"
 msgid "Section settings"
 msgstr "Paramètres généraux :"
 
@@ -565,11 +505,6 @@ msgstr "Apt sécurisé"
 #. type: textblock
 #: pod/multistrap:206
 #, fuzzy
-#| msgid ""
-#| "To use authenticated apt repositories, multistrap either needs to be able "
-#| "to install an appropriate keyring package from the existing apt sources "
-#| "*outside the multistrap environment* or have the relevant keys already "
-#| "configured using apt-key *on the host system*."
 msgid ""
 "To use authenticated apt repositories, multistrap either needs to be able to "
 "install an appropriate keyring package from the existing apt sources "
@@ -596,13 +531,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:216
 #, fuzzy
-#| msgid ""
-#| "Note that *all* repositories to be used with multistrap must be "
-#| "authenticated or apt will fail. Similarly, secure apt can only be "
-#| "disabled for all repositories (by using the --no-auth command line option "
-#| "or setting the general noauth option in the configuration file), even if "
-#| "only one repository does not have a suitable keyring available. Not all "
-#| "packages need keyring packages, if you configure apt-key appropriately."
 msgid ""
 "Note that B<all> repositories to be used with multistrap must be "
 "authenticated or apt will fail. Similarly, secure apt can only be disabled "
@@ -656,7 +584,6 @@ msgstr ""
 #. type: =head1
 #: pod/multistrap:235
 #, fuzzy
-#| msgid "Configuration"
 msgid "Root Filesystem Configuration"
 msgstr "Configuration"
 
@@ -698,11 +625,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:250
 #, fuzzy
-#| msgid ""
-#| "As an alternative, multistrap includes a device-table.pl helper script "
-#| "that can work around some of the issues with MAKEDEV.  device-table.pl "
-#| "requires a device table file along the lines of the one in the mtd-utils "
-#| "source package."
 msgid ""
 "Any device-specific device nodes will also need to be created using MAKEDEV "
 "or C<device-table.pl> - a helper script that can work around some of the "
@@ -777,9 +699,6 @@ msgstr ""
 #. type: verbatim
 #: pod/multistrap:278
 #, fuzzy, no-wrap
-#| msgid ""
-#| " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
-#| " \n"
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
 "\n"
@@ -1016,13 +935,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:356
 #, fuzzy
-#| msgid ""
-#| "Once C<multistrap> has unpacked the downloaded packages, the C<setup.sh> "
-#| "can be called, passing the location and architecture of the root "
-#| "filesystem, so that other fine tuning can take place. At this stage, any "
-#| "operations inside the rootfs must not try to execute any binaries within "
-#| "the rootfs. As the final stage of the multistrap process, C<config.sh> is "
-#| "copied into the F</machine/$MACHINE/default/> directory of the rootfs."
 msgid ""
 "Once C<multistrap> has unpacked the downloaded packages, the C<setup.sh> can "
 "be called, passing the location and architecture of the root filesystem, so "
@@ -1064,12 +976,6 @@ msgstr ""
 #. type: verbatim
 #: pod/multistrap:370
 #, fuzzy, no-wrap
-#| msgid ""
-#| " [General]\n"
-#| " include=/path/to/general.conf\n"
-#| " setup_script=/path/to/setup.sh\n"
-#| " config_script=/path/to/config.sh\n"
-#| "\n"
 msgid ""
 " [General]\n"
 " include=/path/to/general.conf\n"
@@ -1200,11 +1106,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:429
 #, fuzzy
-#| msgid ""
-#| "When using this support in Lenny, ensure that each section uses the "
-#| "codename (etch, lenny, squeeze, sid) instead of the suite (oldstable, "
-#| "stable, testing, sid) for the C<suite> configuration item as the version "
-#| "of apt in Lenny and previous can only use the codename."
 msgid ""
 "When using this support in Lenny, ensure that each section uses the suite "
 "(oldstable, stable, testing, sid) and B<not> the codename (etch, lenny, "
@@ -1266,13 +1167,6 @@ msgstr ""
 #. type: verbatim
 #: pod/multistrap:453
 #, fuzzy, no-wrap
-#| msgid ""
-#| " [Debian]\n"
-#| " packages=\n"
-#| " source=http://ftp.uk.debian.org/debian\n"
-#| " keyring=debian-archive-keyring\n"
-#| " suite=lenny\n"
-#| "\n"
 msgid ""
 " [Baked]\n"
 " packages=\n"
@@ -1329,10 +1223,6 @@ msgstr ""
 #. type: verbatim
 #: device-table.pl:159
 #, fuzzy, no-wrap
-#| msgid ""
-#| " device-table.pl [-d DIR] [-f FILE]\n"
-#| " device-table.pl -?|-h|--help|--version\n"
-#| "\n"
 msgid ""
 " device-table.pl [-n|--dry-run] [-d DIR] [-f FILE]\n"
 " device-table.pl -?|-h|--help|--version\n"
@@ -1345,9 +1235,6 @@ msgstr ""
 #. type: textblock
 #: device-table.pl:164
 #, fuzzy
-#| msgid ""
-#| "By default, device-table.pl writes out the device nodes in the current "
-#| "working directory. Use the directory option to write out elsewhere."
 msgid ""
 "By default, F<device-table.pl> writes out the device nodes in the current "
 "working directory. Use the directory option to write out elsewhere."
@@ -1359,9 +1246,6 @@ msgstr ""
 #. type: textblock
 #: device-table.pl:167
 #, fuzzy
-#| msgid ""
-#| "multistrap contains a default device-table file, use the file option to "
-#| "override the default /usr/share/multistrap/device-table.txt"
 msgid ""
 "multistrap contains a default device-table file, use the file option to "
 "override the default F</usr/share/multistrap/device-table.txt>"
@@ -1380,10 +1264,6 @@ msgstr ""
 #. type: textblock
 #: device-table.pl:172
 #, fuzzy
-#| msgid ""
-#| "Device nodes needs fakeroot or another way to use root access. If device-"
-#| "table.pl is already being run under fakeroot or equivalent, use the no-"
-#| "fakeroot option to drop the internal fakeroot usage."
 msgid ""
 "Device nodes need fakeroot or another way to use root access. If F<device-"
 "table.pl> is already being run under fakeroot or equivalent, the existing "
@@ -1468,7 +1348,6 @@ msgstr ""
 #. type: textblock
 #: device-table.pl:209
 #, fuzzy
-#| msgid "See also: http://wiki.debian.org/Multistrap"
 msgid "See http://wiki.debian.org/DeviceTableScripting"
 msgstr "Voir aussi : http://wiki.debian.org/Multistrap"
 
@@ -2145,8 +2024,8 @@ msgstr "Voir aussi : http://wiki.debian.org/Multistrap"
 #~ "Adds \"export DEBCONF_USE_CDEBCONF=true\" to $TARGET/etc/profile for "
 #~ "cdebconf support."
 #~ msgstr ""
-#~ "Ajoute « export DEBCONF_USE_CDEBCONF=true » au fichier $TARGET/etc/"
-#~ "profile pour activer l'assistance de cdebconf."
+#~ "Ajoute « export DEBCONF_USE_CDEBCONF=true » au fichier $TARGET/etc/profile "
+#~ "pour activer l'assistance de cdebconf."
 
 #~ msgid "symlink_rcS"
 #~ msgstr "symlink_rcS"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 8a0c79e..8ad7937 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: multistrap 2.1.4\n"
-"POT-Creation-Date: 2010-08-17 18:39+0200\n"
+"POT-Creation-Date: 2010-08-19 10:39+0200\n"
 "PO-Revision-Date: 2010-05-14 20:52+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -25,7 +25,6 @@ msgstr "Nome"
 #. type: textblock
 #: pod/multistrap:5
 #, fuzzy
-#| msgid "multistrap - debootstrap replacement for multiple repository support"
 msgid "multistrap - multiple repository bootstraps"
 msgstr ""
 "multistrap - substituto do debootstrap para suporte a múltiplos repositórios"
@@ -115,13 +114,13 @@ msgstr ""
 #: pod/multistrap:36
 #, fuzzy
 msgid ""
-"--sourcedir DIR - move the contents of var/cache/apt/archives/ from inside "
+"--source-dir DIR - move the contents of var/cache/apt/archives/ from inside "
 "the chroot to the specified external directory, then add the Debian source "
 "packages for each used binary. Same as retainsources=DIR If the specified "
 "directory does not exist, nothing is done. Requires --tidy-up in order to "
 "calculate the full list of source packages, including dependencies."
 msgstr ""
-"--sourcedir DIRECTÓRIO - move o conteúdo de var/cache/apt/archives/ de "
+"--source-dir DIRECTÓRIO - move o conteúdo de var/cache/apt/archives/ de "
 "dentro da chroot para o directório externo especificado. O mesmo que "
 "retainsources=DIRECTÓRIO"
 
@@ -230,9 +229,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:86
 #, fuzzy
-#| msgid ""
-#| "This will result in a completely normal debootstrap of Debian lenny from "
-#| "the specified mirror, for armel in '/opt/multistrap/'."
 msgid ""
 "This will result in a completely normal debootstrap of Debian lenny from the "
 "specified mirror, for armel in '/opt/multistrap/'. (This configuration is "
@@ -244,9 +240,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:90
 #, fuzzy
-#| msgid ""
-#| "Specify a package to extend the multistrap to include that package and "
-#| "all dependencies."
 msgid ""
 "Specify a package to extend the multistrap to include that package and all "
 "dependencies of that package."
@@ -257,9 +250,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:93
 #, fuzzy
-#| msgid ""
-#| "Specify more bootstraps by adding new sections. Section names are used in "
-#| "the bootstrap general option."
 msgid ""
 "Specify more repositories for the bootstrap by adding new sections.  Section "
 "names need to be listed in the bootstrap general option for the packages to "
@@ -284,12 +274,6 @@ msgstr "Os nomes das secções são insensíveis a maiúsculas/minúsculas."
 #. type: textblock
 #: pod/multistrap:104
 #, fuzzy
-#| msgid ""
-#| "All dependencies are resolved only by apt, using all bootstrap "
-#| "repositories, to use only the most recent and most suitable dependencies. "
-#| "Note that multistrap turns off Install-Recommends so if the multistrap "
-#| "needs a package that is only a Recommended dependency, the recommended "
-#| "package needs to be specified in the packages line explicitly."
 msgid ""
 "All dependencies are resolved only by apt, using all bootstrap repositories, "
 "to use only the most recent and most suitable dependencies. Note that "
@@ -519,11 +503,6 @@ msgstr "Segurança do Apt"
 #. type: textblock
 #: pod/multistrap:206
 #, fuzzy
-#| msgid ""
-#| "To use authenticated apt repositories, multistrap either needs to be able "
-#| "to install an appropriate keyring package from the existing apt sources "
-#| "*outside the multistrap environment* or have the relevant keys already "
-#| "configured using apt-key *on the host system*."
 msgid ""
 "To use authenticated apt repositories, multistrap either needs to be able to "
 "install an appropriate keyring package from the existing apt sources "
@@ -551,13 +530,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:216
 #, fuzzy
-#| msgid ""
-#| "Note that *all* repositories to be used with multistrap must be "
-#| "authenticated or apt will fail. Similarly, secure apt can only be "
-#| "disabled for all repositories (by using the --no-auth command line option "
-#| "or setting the general noauth option in the configuration file), even if "
-#| "only one repository does not have a suitable keyring available. Not all "
-#| "packages need keyring packages, if you configure apt-key appropriately."
 msgid ""
 "Note that B<all> repositories to be used with multistrap must be "
 "authenticated or apt will fail. Similarly, secure apt can only be disabled "
@@ -609,7 +581,6 @@ msgstr ""
 #. type: =head1
 #: pod/multistrap:235
 #, fuzzy
-#| msgid "Configuration"
 msgid "Root Filesystem Configuration"
 msgstr "Configuração"
 
@@ -651,11 +622,6 @@ msgstr ""
 #. type: textblock
 #: pod/multistrap:250
 #, fuzzy
-#| msgid ""
-#| "As an alternative, multistrap includes a device-table.pl helper script "
-#| "that can work around some of the issues with MAKEDEV.  device-table.pl "
-#| "requires a device table file along the lines of the one in the mtd-utils "
-#| "source package."
 msgid ""
 "Any device-specific device nodes will also need to be created using MAKEDEV "
 "or C<device-table.pl> - a helper script that can work around some of the "