From 426ac8f2e107436a9da459d6c51db11f9fb271b5 Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Mon, 3 May 2010 13:17:58 +0000
Subject: [PATCH] typo

git-svn-id: http://emdebian.org/svn/current@7171 563faec7-e20c-0410-992a-a66f704d0ccd
---
 debian/multistrap.install |   1 -
 doc/po/fr.po              | 194 +++++++++++++++++++++-----------------
 doc/po/pt.po              | 194 +++++++++++++++++++++-----------------
 3 files changed, 214 insertions(+), 175 deletions(-)

diff --git a/debian/multistrap.install b/debian/multistrap.install
index caeb315..9e93b54 100644
--- a/debian/multistrap.install
+++ b/debian/multistrap.install
@@ -14,4 +14,3 @@ bash/multistrap ./etc/bash_completion.d/
 cross/*.conf ./usr/share/multistrap/
 cross/test.c ./usr/share/multistrap/
 cross/setcrossarch.sh ./usr/share/multistrap/
-cross/functions ./usr/share/multistrap/
diff --git a/doc/po/fr.po b/doc/po/fr.po
index ac6f85e..24c9b8b 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: emdebian-rootfs 2.0.2\n"
-"POT-Creation-Date: 2010-04-30 19:12+0200\n"
+"POT-Creation-Date: 2010-05-03 14:10+0200\n"
 "PO-Revision-Date: 2009-11-11 21:57+0100\n"
 "Last-Translator: Alexandre Normand <aj.normand@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -52,13 +52,26 @@ msgstr "Options"
 
 #. type: textblock
 #: pod/multistrap:14
-msgid "(These options can also be set in the configuration file.)"
+msgid ""
+"--dry-run - collate all the configuration settings and output a bare summary."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:17
+msgid "--simulate - same as --dry-run"
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:19
+#, fuzzy
+#| msgid "(These options can also be set in the configuration file.)"
+msgid "(The following options can also be set in the configuration file.)"
 msgstr ""
 "(Ces options peuvent également être définies dans le fichier de "
 "configuration.)"
 
 #. type: textblock
-#: pod/multistrap:16
+#: pod/multistrap:21
 msgid ""
 "--tidy-up - remove apt cache data, downloaded Packages files and the apt "
 "package cache. Same as cleanup=true."
@@ -67,7 +80,7 @@ msgstr ""
 "téléchargés et le cache des paquets apt. Identique à cleanup=true."
 
 #. type: textblock
-#: pod/multistrap:19
+#: pod/multistrap:24
 msgid ""
 "--no-auth - allow the use of unauthenticated repositories. Same as "
 "noauth=true"
@@ -75,13 +88,20 @@ msgstr ""
 "--no-auth - autoriser l'utilisation de dépôts non authentifiés. Identique à "
 "noauth=true"
 
+#. type: textblock
+#: pod/multistrap:27
+msgid ""
+"--sourcedir DIR - move the contents of var/cache/apt/archives/ from inside "
+"the chroot to the specified external directory. Same as retainsources=DIR"
+msgstr ""
+
 #. type: =head1
-#: pod/multistrap:22
+#: pod/multistrap:32
 msgid "Description"
 msgstr "Description"
 
 #. type: textblock
-#: pod/multistrap:24
+#: pod/multistrap:34
 #, fuzzy
 msgid ""
 "multistrap provides a debootstrap-like method based on apt and extended to "
@@ -95,7 +115,7 @@ msgstr ""
 "supplémentaires et le miroir à utiliser pour chaque debootstrap."
 
 #. type: textblock
-#: pod/multistrap:29
+#: pod/multistrap:39
 msgid ""
 "The aim is to create a complete debootstrap with all packages installed and "
 "configured, instead of just the base system."
@@ -104,12 +124,12 @@ msgstr ""
 "et configurés, plutôt que de créer uniquement le système de base."
 
 #. type: textblock
-#: pod/multistrap:32
+#: pod/multistrap:42
 msgid "Example configuration:"
 msgstr "Exemple de configuration :"
 
 #. type: verbatim
-#: pod/multistrap:34
+#: pod/multistrap:44
 #, fuzzy, no-wrap
 #| msgid ""
 #| " [General]\n"
@@ -148,10 +168,10 @@ msgid ""
 " # the /etc/apt/sources.list.d/multistrap.sources.list      \n"
 " # of the target. Order is not important\n"
 " aptsources=Grip Updates\n"
-" # the order of sections is not important.\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"
 msgstr ""
@@ -177,7 +197,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: pod/multistrap:55
+#: pod/multistrap:65
 #, no-wrap
 msgid ""
 " [Debian]\n"
@@ -195,7 +215,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:61
+#: pod/multistrap:71
 msgid ""
 "This will result in a completely normal debootstrap of Debian lenny from the "
 "specified mirror, for armel in '/opt/multistrap/'."
@@ -204,7 +224,7 @@ msgstr ""
 "partir du miroir spécifié, pour armel dans « /opt/multistrap/ »."
 
 #. type: textblock
-#: pod/multistrap:64
+#: pod/multistrap:74
 msgid ""
 "Specify a package to extend the multistrap to include that package and all "
 "dependencies."
@@ -213,7 +233,7 @@ msgstr ""
 "toutes ses dépendances."
 
 #. type: textblock
-#: pod/multistrap:67
+#: pod/multistrap:77
 msgid ""
 "Specify more debootstraps by adding new sections. Section names are used in "
 "the debootstrap general option."
@@ -222,17 +242,17 @@ msgstr ""
 "de sections sont utilisés dans l'option générale de debootstrap."
 
 #. type: textblock
-#: pod/multistrap:70
+#: pod/multistrap:80
 msgid "Section names are case-insensitive."
 msgstr "La casse des lettres n'est pas importante dans les noms de section."
 
 #. type: textblock
-#: pod/multistrap:72
+#: pod/multistrap:82
 msgid "e.g. change"
 msgstr "par exemple, changer"
 
 #. type: verbatim
-#: pod/multistrap:74
+#: pod/multistrap:84
 #, no-wrap
 msgid ""
 " debootstrap=Debian\n"
@@ -242,12 +262,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:76
+#: pod/multistrap:86
 msgid "to"
 msgstr "en"
 
 #. type: verbatim
-#: pod/multistrap:78
+#: pod/multistrap:88
 #, no-wrap
 msgid ""
 " debootstrap=Grip\n"
@@ -257,7 +277,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: pod/multistrap:80
+#: pod/multistrap:90
 #, no-wrap
 msgid ""
 "then add the new section for Grip:\n"
@@ -267,7 +287,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: pod/multistrap:82
+#: pod/multistrap:92
 #, no-wrap
 msgid ""
 " [Grip]\n"
@@ -285,7 +305,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:88
+#: pod/multistrap:98
 msgid ""
 "Setting Grip instead of Debian in the debootstrap option, as above, will "
 "provide a base system from Emdebian Grip 1.0 and locate any missing "
@@ -299,7 +319,7 @@ msgstr ""
 "dans Emdebian Grip."
 
 #. type: textblock
-#: pod/multistrap:93
+#: pod/multistrap:103
 msgid ""
 "All dependencies are resolved only by apt, using all configured "
 "repositories, to use only the most recent and most suitable dependencies. "
@@ -315,7 +335,7 @@ msgstr ""
 "paquets."
 
 #. type: textblock
-#: pod/multistrap:100
+#: pod/multistrap:110
 msgid ""
 "'Architecture' and 'directory' can be overridden on the command line.  Other "
 "general options have command line options, except debootstrap itself."
@@ -325,12 +345,12 @@ msgstr ""
 "sauf debootstrap."
 
 #. type: =head1
-#: pod/multistrap:104
+#: pod/multistrap:114
 msgid "General settings:"
 msgstr "Paramètres généraux :"
 
 #. type: textblock
-#: pod/multistrap:106
+#: pod/multistrap:116
 msgid ""
 "'directory' specifies the top level directory where the debootstrap will be "
 "created - it is not packed into a .tgz once complete."
@@ -339,13 +359,13 @@ msgstr ""
 "sera créé - il n'est pas empaqueté en un .tgz une fois complété."
 
 #. type: textblock
-#: pod/multistrap:109
+#: pod/multistrap:119
 #, fuzzy
 msgid "As with debootstrap, multistrap will continue after errors."
 msgstr "Comme pour debootstrap, em_multistrap se poursuivra après des erreurs."
 
 #. type: textblock
-#: pod/multistrap:111
+#: pod/multistrap:121
 msgid ""
 "multistrap also implements the machine:variant support originally used in "
 "Emdebian Crush, although in a different implementation. Using the cascading "
@@ -354,19 +374,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:116
+#: pod/multistrap:126
 msgid ""
 "Setting C<compress> to true also packs up the final filesystem into a "
 "tarball."
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:119
+#: pod/multistrap:129
 msgid "Secure Apt"
 msgstr "Apt sécurisé"
 
 #. type: textblock
-#: pod/multistrap:121
+#: pod/multistrap:131
 msgid ""
 "To use authenticated apt repositories, multistrap either needs to be able to "
 "install an appropriate keyring package from the existing apt sources "
@@ -379,7 +399,7 @@ msgstr ""
 "en utilisant apt-key *sur le système hôte*."
 
 #. type: textblock
-#: pod/multistrap:126
+#: pod/multistrap:136
 #, fuzzy
 msgid ""
 "If relevant packages exist, specify them in the 'keyring' option for each "
@@ -392,7 +412,7 @@ msgstr ""
 "ainsi le dépôt pourra être authentifié avant de télécharger des paquets."
 
 #. type: textblock
-#: pod/multistrap:131
+#: pod/multistrap:141
 msgid ""
 "Note that *all* repositories to be used with multistrap must be "
 "authenticated or apt will fail. Similarly, secure apt can only be disabled "
@@ -410,7 +430,7 @@ msgstr ""
 "de clés, si vous configurez apt-key correctement."
 
 #. type: textblock
-#: pod/multistrap:139
+#: pod/multistrap:149
 msgid ""
 "The keyring package(s) will also be installed inside the multistrap "
 "environment to match the installed apt sources for the multistrap."
@@ -420,7 +440,7 @@ msgstr ""
 "installés du multistrap."
 
 #. type: textblock
-#: pod/multistrap:142
+#: pod/multistrap:152
 msgid ""
 "All configuration of apt-key needs to be done for the machine running "
 "multistrap itself."
@@ -429,12 +449,12 @@ msgstr ""
 "multistrap."
 
 #. type: =head1
-#: pod/multistrap:145
+#: pod/multistrap:155
 msgid "State"
 msgstr "État"
 
 #. type: textblock
-#: pod/multistrap:147
+#: pod/multistrap:157
 msgid ""
 "multistrap is stateless - if the directory exists, it will simply proceed as "
 "normal and apt will try to pick up where it left off."
@@ -444,12 +464,12 @@ msgstr ""
 "s'était arrêté."
 
 #. type: =head1
-#: pod/multistrap:150
+#: pod/multistrap:160
 msgid "Configuration"
 msgstr "Configuration"
 
 #. type: textblock
-#: pod/multistrap:152
+#: pod/multistrap:162
 msgid ""
 "multistrap unpacks the downloaded packages but other stages of system "
 "configuration are not attempted. Examples include:"
@@ -458,7 +478,7 @@ msgstr ""
 "configuration du système ne sont pas tentées. Les exemples incluent : "
 
 #. type: verbatim
-#: pod/multistrap:155
+#: pod/multistrap:165
 #, no-wrap
 msgid ""
 " /etc/inittab\n"
@@ -484,7 +504,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:165
+#: pod/multistrap:175
 msgid ""
 "Any device-specific device nodes will also need to be created using MAKEDEV."
 msgstr ""
@@ -492,7 +512,7 @@ msgstr ""
 "utilisant MAKEDEV."
 
 #. type: textblock
-#: pod/multistrap:168
+#: pod/multistrap:178
 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 "
@@ -500,7 +520,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:173
+#: pod/multistrap:183
 msgid ""
 "Once multistrap has successfully created the basic file and directory "
 "layout, other device-specific scripts are needed before the filesystem can "
@@ -512,7 +532,7 @@ msgstr ""
 "le périphérique cible."
 
 #. type: textblock
-#: pod/multistrap:178
+#: pod/multistrap:188
 msgid ""
 "Once installed, the packages themselves need to be configured using the "
 "package maintainer scripts and C<dpkg --configure -a>, unless this is a "
@@ -523,7 +543,7 @@ msgstr ""
 "moins qu'il ne s'agisse d'un multistrap natif."
 
 #. type: textblock
-#: pod/multistrap:182
+#: pod/multistrap:192
 msgid ""
 "For C<dpkg> to work, F</proc> and F</sysfs> must be mounted (or mountable), "
 "F</dev/pts> is also recommended."
@@ -532,17 +552,17 @@ msgstr ""
 "montés (ou être montables), F</dev/pts> est également recommandé."
 
 #. type: textblock
-#: pod/multistrap:185
+#: pod/multistrap:195
 msgid "See also: http://wiki.debian.org/Multistrap"
 msgstr "Voir aussi : http://wiki.debian.org/Multistrap"
 
 #. type: =head1
-#: pod/multistrap:187
+#: pod/multistrap:197
 msgid "Environment"
 msgstr "Environnement"
 
 #. type: textblock
-#: pod/multistrap:189
+#: pod/multistrap:199
 msgid ""
 "To configure the unpacked packages (whether in native or cross mode), "
 "certain environment variables are needed:"
@@ -551,7 +571,7 @@ msgstr ""
 "natif), certaines variables d'environnements sont nécessaires :"
 
 #. type: textblock
-#: pod/multistrap:192
+#: pod/multistrap:202
 msgid ""
 "Debconf needs to be told to accept that user interaction is not desired:"
 msgstr ""
@@ -559,7 +579,7 @@ msgstr ""
 "pas souhaitée : "
 
 #. type: verbatim
-#: pod/multistrap:195
+#: pod/multistrap:205
 #, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
@@ -569,7 +589,7 @@ msgstr ""
 " \n"
 
 #. type: textblock
-#: pod/multistrap:197
+#: pod/multistrap:207
 msgid ""
 "Perl needs to be told to accept that no locales are available inside the "
 "chroot and not to complain:"
@@ -578,7 +598,7 @@ msgstr ""
 "l'intérieur du chroot et de ne pas se plaindre :"
 
 #. type: verbatim
-#: pod/multistrap:200
+#: pod/multistrap:210
 #, no-wrap
 msgid ""
 " LC_ALL=C LANGUAGE=C LANG=C\n"
@@ -588,17 +608,17 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:202
+#: pod/multistrap:212
 msgid "Then, dpkg can configure the packages:"
 msgstr "Puis, dpkg peut configurer les paquets :"
 
 #. type: textblock
-#: pod/multistrap:204
+#: pod/multistrap:214
 msgid "chroot method (PATH = top directory of chroot):"
 msgstr "méthode chroot (PATH = le répertoire de base du chroot) :"
 
 #. type: verbatim
-#: pod/multistrap:206
+#: pod/multistrap:216
 #, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \\\n"
@@ -610,12 +630,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:209
+#: pod/multistrap:219
 msgid "at a login shell:"
 msgstr "dans un interpréteur de commandes de connexion : "
 
 #. type: verbatim
-#: pod/multistrap:211
+#: pod/multistrap:221
 #, no-wrap
 msgid ""
 " # export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
@@ -629,19 +649,19 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:215
+#: pod/multistrap:225
 msgid "(As above, dpkg needs F</proc> and F</sysfs> mounted first.)"
 msgstr ""
 "(Comme ci-dessus, dpkg a besoin que F</proc> et F</sysfs> soient montés en "
 "premier.)"
 
 #. type: =head1
-#: pod/multistrap:217
+#: pod/multistrap:227
 msgid "Native mode - multistrap"
 msgstr "mode natif - multistrap"
 
 #. type: textblock
-#: pod/multistrap:219
+#: pod/multistrap:229
 #, fuzzy
 msgid ""
 "multistrap was not intended for native support, it was developed for cross "
@@ -654,7 +674,7 @@ msgstr ""
 "par apt."
 
 #. type: textblock
-#: pod/multistrap:223
+#: pod/multistrap:233
 msgid ""
 "In native mode, various post-multistrap operations are likely to be needed "
 "that debootstrap would do for you:"
@@ -663,7 +683,7 @@ msgstr ""
 "pour vous sont probablement nécessaires :"
 
 #. type: verbatim
-#: pod/multistrap:226
+#: pod/multistrap:236
 #, no-wrap
 msgid ""
 " 1. copy /etc/hosts into the chroot\n"
@@ -677,7 +697,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:230
+#: pod/multistrap:240
 msgid ""
 "(An alternative to unset the localisation variables is to add locales to "
 "your multistrap configuration file in the 'packages' option."
@@ -687,7 +707,7 @@ msgstr ""
 "»."
 
 #. type: textblock
-#: pod/multistrap:234
+#: pod/multistrap:244
 msgid ""
 "A native multistrap can be used directly with chroot, so C<multistrap> runs "
 "C<dpkg --configure -a> at the end of the multistrap process."
@@ -697,13 +717,13 @@ msgstr ""
 "multistrap."
 
 #. type: =head1
-#: pod/multistrap:238
+#: pod/multistrap:248
 #, fuzzy
 msgid "Cascading configuration"
 msgstr "Configuration"
 
 #. type: textblock
-#: pod/multistrap:240
+#: pod/multistrap:250
 msgid ""
 "To support multiple variants of a basic (common) configuration, "
 "C<multistrap> allows configuration files to include other (more general)  "
@@ -713,12 +733,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:246
+#: pod/multistrap:256
 msgid "Base file:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:248
+#: pod/multistrap:258
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/crosschroot.conf\n"
@@ -726,12 +746,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:250
+#: pod/multistrap:260
 msgid "Variations:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:252
+#: pod/multistrap:262
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/armel.conf\n"
@@ -739,7 +759,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:254
+#: pod/multistrap:264
 msgid ""
 "Specifying just the armel.conf file will get the rest of the settings from "
 "crosschroot.conf so that common changes only need to be made in a single "
@@ -747,7 +767,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:258
+#: pod/multistrap:268
 msgid ""
 "It is B<strongly> recommended that any changes to the configuration files "
 "involved in any particular cascade are tested using the C<--simulate> option "
@@ -759,13 +779,13 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:266
+#: pod/multistrap:276
 #, fuzzy
 msgid "Machine:variant support"
 msgstr "Variantes de Machines"
 
 #. type: textblock
-#: pod/multistrap:268
+#: pod/multistrap:278
 msgid ""
 "The old packages.conf variables from emsandbox can all be converted into "
 "C<multistrap> configuration variables. The machine:variant support in "
@@ -773,7 +793,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:273
+#: pod/multistrap:283
 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 "
@@ -784,7 +804,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:281
+#: pod/multistrap:291
 msgid ""
 "One advantage of using machine:variant support is that the entire "
 "rootfilesystem can be managed by a single call to multistrap - this is "
@@ -792,14 +812,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:285
+#: pod/multistrap:295
 msgid ""
 "To enable machine:variant support, specify the path to the scripts to be "
 "called in the variant configuration file (General section):"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:288
+#: pod/multistrap:298
 #, no-wrap
 msgid ""
 " [General]\n"
@@ -810,19 +830,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:294
+#: pod/multistrap:304
 msgid "Restricting package selection"
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:296
+#: pod/multistrap:306
 msgid ""
 "C<multistrap> includes Required packages by default, the current list of "
 "packages can be seen using:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:299
+#: pod/multistrap:309
 #, no-wrap
 msgid ""
 " grep-available  -FPriority 'required' -sPackage\n"
@@ -830,7 +850,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:301
+#: pod/multistrap:311
 msgid ""
 "If the OmitRequired option is set to true, these packages will not be added "
 "- whilst useful, this option can easily lead to a useless rootfs. Only the "
@@ -839,12 +859,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:307
+#: pod/multistrap:317
 msgid "Collecting packages from specific codenames/suites."
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:309
+#: pod/multistrap:319
 msgid ""
 "Packages specified explicitly in the configuration sections will be passed "
 "to apt as package/codename so that the configuration controls which version "
@@ -853,7 +873,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:314
+#: pod/multistrap:324
 msgid ""
 "When using this support in Lenny, ensure that each section uses the codename "
 "(etch, lenny, squeeze, sid) instead of the suite (oldstable, stable, "
@@ -862,12 +882,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:319
+#: pod/multistrap:329
 msgid "Recommends TOIMPLEMENT:"
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:321
+#: pod/multistrap:331
 msgid "Default recommends OFF option to set it as on."
 msgstr ""
 
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 6318914..9ee66af 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: emdebian-rootfs 2.0.4\n"
-"POT-Creation-Date: 2010-04-30 19:12+0200\n"
+"POT-Creation-Date: 2010-05-03 14:10+0200\n"
 "PO-Revision-Date: 2009-11-14 17:16+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -52,11 +52,24 @@ msgstr "Opções"
 
 #. type: textblock
 #: pod/multistrap:14
-msgid "(These options can also be set in the configuration file.)"
+msgid ""
+"--dry-run - collate all the configuration settings and output a bare summary."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:17
+msgid "--simulate - same as --dry-run"
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:19
+#, fuzzy
+#| msgid "(These options can also be set in the configuration file.)"
+msgid "(The following options can also be set in the configuration file.)"
 msgstr "(Estas opções também podem ser definidas no ficheiro de configuração.)"
 
 #. type: textblock
-#: pod/multistrap:16
+#: pod/multistrap:21
 msgid ""
 "--tidy-up - remove apt cache data, downloaded Packages files and the apt "
 "package cache. Same as cleanup=true."
@@ -65,7 +78,7 @@ msgstr ""
 "e a cache de pacotes do apt. O mesmo que cleanup=true."
 
 #. type: textblock
-#: pod/multistrap:19
+#: pod/multistrap:24
 msgid ""
 "--no-auth - allow the use of unauthenticated repositories. Same as "
 "noauth=true"
@@ -73,13 +86,20 @@ msgstr ""
 "--no-auth - permite o uso de repositórios não autenticados. O mesmo que "
 "noauth=true"
 
+#. type: textblock
+#: pod/multistrap:27
+msgid ""
+"--sourcedir DIR - move the contents of var/cache/apt/archives/ from inside "
+"the chroot to the specified external directory. Same as retainsources=DIR"
+msgstr ""
+
 #. type: =head1
-#: pod/multistrap:22
+#: pod/multistrap:32
 msgid "Description"
 msgstr "Descrição"
 
 #. type: textblock
-#: pod/multistrap:24
+#: pod/multistrap:34
 #, fuzzy
 msgid ""
 "multistrap provides a debootstrap-like method based on apt and extended to "
@@ -93,7 +113,7 @@ msgstr ""
 "arquitectura, pacotes extra e o mirror a usar para cada debootstrap."
 
 #. type: textblock
-#: pod/multistrap:29
+#: pod/multistrap:39
 msgid ""
 "The aim is to create a complete debootstrap with all packages installed and "
 "configured, instead of just the base system."
@@ -102,12 +122,12 @@ msgstr ""
 "e configurados, e vez de apenas o sistema base."
 
 #. type: textblock
-#: pod/multistrap:32
+#: pod/multistrap:42
 msgid "Example configuration:"
 msgstr "Exemplo de configuração:"
 
 #. type: verbatim
-#: pod/multistrap:34
+#: pod/multistrap:44
 #, fuzzy, no-wrap
 #| msgid ""
 #| " [General]\n"
@@ -146,10 +166,10 @@ msgid ""
 " # the /etc/apt/sources.list.d/multistrap.sources.list      \n"
 " # of the target. Order is not important\n"
 " aptsources=Grip Updates\n"
-" # the order of sections is not important.\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"
 msgstr ""
@@ -175,7 +195,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: pod/multistrap:55
+#: pod/multistrap:65
 #, no-wrap
 msgid ""
 " [Debian]\n"
@@ -193,7 +213,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:61
+#: pod/multistrap:71
 msgid ""
 "This will result in a completely normal debootstrap of Debian lenny from the "
 "specified mirror, for armel in '/opt/multistrap/'."
@@ -202,7 +222,7 @@ msgstr ""
 "partir do mirror especificado, para armel em '/opt/multistrap/'."
 
 #. type: textblock
-#: pod/multistrap:64
+#: pod/multistrap:74
 msgid ""
 "Specify a package to extend the multistrap to include that package and all "
 "dependencies."
@@ -211,7 +231,7 @@ msgstr ""
 "todas as dependências."
 
 #. type: textblock
-#: pod/multistrap:67
+#: pod/multistrap:77
 msgid ""
 "Specify more debootstraps by adding new sections. Section names are used in "
 "the debootstrap general option."
@@ -220,17 +240,17 @@ msgstr ""
 "secções são usados na opção geral do debootstrap."
 
 #. type: textblock
-#: pod/multistrap:70
+#: pod/multistrap:80
 msgid "Section names are case-insensitive."
 msgstr "Os nomes das secções são insensíveis a maiúsculas/minúsculas."
 
 #. type: textblock
-#: pod/multistrap:72
+#: pod/multistrap:82
 msgid "e.g. change"
 msgstr "ex. change"
 
 #. type: verbatim
-#: pod/multistrap:74
+#: pod/multistrap:84
 #, no-wrap
 msgid ""
 " debootstrap=Debian\n"
@@ -240,12 +260,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:76
+#: pod/multistrap:86
 msgid "to"
 msgstr "para"
 
 #. type: verbatim
-#: pod/multistrap:78
+#: pod/multistrap:88
 #, no-wrap
 msgid ""
 " debootstrap=Grip\n"
@@ -255,7 +275,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: pod/multistrap:80
+#: pod/multistrap:90
 #, no-wrap
 msgid ""
 "then add the new section for Grip:\n"
@@ -265,7 +285,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: pod/multistrap:82
+#: pod/multistrap:92
 #, no-wrap
 msgid ""
 " [Grip]\n"
@@ -283,7 +303,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:88
+#: pod/multistrap:98
 msgid ""
 "Setting Grip instead of Debian in the debootstrap option, as above, will "
 "provide a base system from Emdebian Grip 1.0 and locate any missing "
@@ -297,7 +317,7 @@ msgstr ""
 "Emdebian Grip."
 
 #. type: textblock
-#: pod/multistrap:93
+#: pod/multistrap:103
 msgid ""
 "All dependencies are resolved only by apt, using all configured "
 "repositories, to use only the most recent and most suitable dependencies. "
@@ -313,7 +333,7 @@ msgstr ""
 "explicitamente na linha de pacotes."
 
 #. type: textblock
-#: pod/multistrap:100
+#: pod/multistrap:110
 msgid ""
 "'Architecture' and 'directory' can be overridden on the command line.  Other "
 "general options have command line options, except debootstrap itself."
@@ -323,12 +343,12 @@ msgstr ""
 "debootstrap."
 
 #. type: =head1
-#: pod/multistrap:104
+#: pod/multistrap:114
 msgid "General settings:"
 msgstr "Definições gerais:"
 
 #. type: textblock
-#: pod/multistrap:106
+#: pod/multistrap:116
 msgid ""
 "'directory' specifies the top level directory where the debootstrap will be "
 "created - it is not packed into a .tgz once complete."
@@ -337,14 +357,14 @@ msgstr ""
 "ser criado - não é empacotado em um .tgz depois de completo."
 
 #. type: textblock
-#: pod/multistrap:109
+#: pod/multistrap:119
 #, fuzzy
 msgid "As with debootstrap, multistrap will continue after errors."
 msgstr ""
 "Tal como acontece com o debootstrap, em_multistrap irá continuar após erros."
 
 #. type: textblock
-#: pod/multistrap:111
+#: pod/multistrap:121
 msgid ""
 "multistrap also implements the machine:variant support originally used in "
 "Emdebian Crush, although in a different implementation. Using the cascading "
@@ -353,19 +373,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:116
+#: pod/multistrap:126
 msgid ""
 "Setting C<compress> to true also packs up the final filesystem into a "
 "tarball."
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:119
+#: pod/multistrap:129
 msgid "Secure Apt"
 msgstr "Segurança do Apt"
 
 #. type: textblock
-#: pod/multistrap:121
+#: pod/multistrap:131
 msgid ""
 "To use authenticated apt repositories, multistrap either needs to be able to "
 "install an appropriate keyring package from the existing apt sources "
@@ -378,7 +398,7 @@ msgstr ""
 "configuradas usando apt-key *na máquina do sistema*."
 
 #. type: textblock
-#: pod/multistrap:126
+#: pod/multistrap:136
 #, fuzzy
 msgid ""
 "If relevant packages exist, specify them in the 'keyring' option for each "
@@ -392,7 +412,7 @@ msgstr ""
 "pacotes sejam descarregados dele."
 
 #. type: textblock
-#: pod/multistrap:131
+#: pod/multistrap:141
 msgid ""
 "Note that *all* repositories to be used with multistrap must be "
 "authenticated or apt will fail. Similarly, secure apt can only be disabled "
@@ -410,7 +430,7 @@ msgstr ""
 "apt-key apropriadamente."
 
 #. type: textblock
-#: pod/multistrap:139
+#: pod/multistrap:149
 msgid ""
 "The keyring package(s) will also be installed inside the multistrap "
 "environment to match the installed apt sources for the multistrap."
@@ -419,7 +439,7 @@ msgstr ""
 "multistrap para coincidir com as fontes apt instaladas para o multistrap."
 
 #. type: textblock
-#: pod/multistrap:142
+#: pod/multistrap:152
 msgid ""
 "All configuration of apt-key needs to be done for the machine running "
 "multistrap itself."
@@ -428,12 +448,12 @@ msgstr ""
 "correndo o próprio multistrap."
 
 #. type: =head1
-#: pod/multistrap:145
+#: pod/multistrap:155
 msgid "State"
 msgstr "Estado"
 
 #. type: textblock
-#: pod/multistrap:147
+#: pod/multistrap:157
 msgid ""
 "multistrap is stateless - if the directory exists, it will simply proceed as "
 "normal and apt will try to pick up where it left off."
@@ -442,12 +462,12 @@ msgstr ""
 "prosseguir como normalmente e o apt irá tentar prosseguir de onde ficou."
 
 #. type: =head1
-#: pod/multistrap:150
+#: pod/multistrap:160
 msgid "Configuration"
 msgstr "Configuração"
 
 #. type: textblock
-#: pod/multistrap:152
+#: pod/multistrap:162
 msgid ""
 "multistrap unpacks the downloaded packages but other stages of system "
 "configuration are not attempted. Examples include:"
@@ -456,7 +476,7 @@ msgstr ""
 "outros estágios da configuração do sistema. Os exemplos incluem:"
 
 #. type: verbatim
-#: pod/multistrap:155
+#: pod/multistrap:165
 #, no-wrap
 msgid ""
 " /etc/inittab\n"
@@ -482,7 +502,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:165
+#: pod/multistrap:175
 msgid ""
 "Any device-specific device nodes will also need to be created using MAKEDEV."
 msgstr ""
@@ -490,7 +510,7 @@ msgstr ""
 "ser criados usando o MAKEDEV."
 
 #. type: textblock
-#: pod/multistrap:168
+#: pod/multistrap:178
 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 "
@@ -498,7 +518,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:173
+#: pod/multistrap:183
 msgid ""
 "Once multistrap has successfully created the basic file and directory "
 "layout, other device-specific scripts are needed before the filesystem can "
@@ -510,7 +530,7 @@ msgstr ""
 "de destino."
 
 #. type: textblock
-#: pod/multistrap:178
+#: pod/multistrap:188
 msgid ""
 "Once installed, the packages themselves need to be configured using the "
 "package maintainer scripts and C<dpkg --configure -a>, unless this is a "
@@ -521,7 +541,7 @@ msgstr ""
 "seja um multistrap nativo."
 
 #. type: textblock
-#: pod/multistrap:182
+#: pod/multistrap:192
 msgid ""
 "For C<dpkg> to work, F</proc> and F</sysfs> must be mounted (or mountable), "
 "F</dev/pts> is also recommended."
@@ -530,17 +550,17 @@ msgstr ""
 "(ou serem montáveis), também é recomendado F</dev/pts>."
 
 #. type: textblock
-#: pod/multistrap:185
+#: pod/multistrap:195
 msgid "See also: http://wiki.debian.org/Multistrap"
 msgstr "Veja também: http://wiki.debian.org/Multistrap"
 
 #. type: =head1
-#: pod/multistrap:187
+#: pod/multistrap:197
 msgid "Environment"
 msgstr "Ambiente"
 
 #. type: textblock
-#: pod/multistrap:189
+#: pod/multistrap:199
 msgid ""
 "To configure the unpacked packages (whether in native or cross mode), "
 "certain environment variables are needed:"
@@ -549,7 +569,7 @@ msgstr ""
 "são necessárias certas variáveis de ambiente:"
 
 #. type: textblock
-#: pod/multistrap:192
+#: pod/multistrap:202
 msgid ""
 "Debconf needs to be told to accept that user interaction is not desired:"
 msgstr ""
@@ -557,7 +577,7 @@ msgstr ""
 "utilizador não é desejada:"
 
 #. type: verbatim
-#: pod/multistrap:195
+#: pod/multistrap:205
 #, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
@@ -567,7 +587,7 @@ msgstr ""
 " \n"
 
 #. type: textblock
-#: pod/multistrap:197
+#: pod/multistrap:207
 msgid ""
 "Perl needs to be told to accept that no locales are available inside the "
 "chroot and not to complain:"
@@ -576,7 +596,7 @@ msgstr ""
 "dentro da chroot e não se queixar:"
 
 #. type: verbatim
-#: pod/multistrap:200
+#: pod/multistrap:210
 #, no-wrap
 msgid ""
 " LC_ALL=C LANGUAGE=C LANG=C\n"
@@ -586,17 +606,17 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:202
+#: pod/multistrap:212
 msgid "Then, dpkg can configure the packages:"
 msgstr "Depois, o dpkg pode configurar os pacotes."
 
 #. type: textblock
-#: pod/multistrap:204
+#: pod/multistrap:214
 msgid "chroot method (PATH = top directory of chroot):"
 msgstr "método de chroot (PATH = directório de topo da chroot):"
 
 #. type: verbatim
-#: pod/multistrap:206
+#: pod/multistrap:216
 #, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \\\n"
@@ -608,12 +628,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:209
+#: pod/multistrap:219
 msgid "at a login shell:"
 msgstr "numa shell de login:"
 
 #. type: verbatim
-#: pod/multistrap:211
+#: pod/multistrap:221
 #, no-wrap
 msgid ""
 " # export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
@@ -627,18 +647,18 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:215
+#: pod/multistrap:225
 msgid "(As above, dpkg needs F</proc> and F</sysfs> mounted first.)"
 msgstr ""
 "(Como em cima, o dpkg precisa de F</proc> e F</sysfs> montados primeiro.)"
 
 #. type: =head1
-#: pod/multistrap:217
+#: pod/multistrap:227
 msgid "Native mode - multistrap"
 msgstr "Modo nativo - multistrap"
 
 #. type: textblock
-#: pod/multistrap:219
+#: pod/multistrap:229
 #, fuzzy
 msgid ""
 "multistrap was not intended for native support, it was developed for cross "
@@ -651,7 +671,7 @@ msgstr ""
 "apt."
 
 #. type: textblock
-#: pod/multistrap:223
+#: pod/multistrap:233
 msgid ""
 "In native mode, various post-multistrap operations are likely to be needed "
 "that debootstrap would do for you:"
@@ -660,7 +680,7 @@ msgstr ""
 "multistrap que o debootstrap faria por si:"
 
 #. type: verbatim
-#: pod/multistrap:226
+#: pod/multistrap:236
 #, no-wrap
 msgid ""
 " 1. copy /etc/hosts into the chroot\n"
@@ -674,7 +694,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:230
+#: pod/multistrap:240
 msgid ""
 "(An alternative to unset the localisation variables is to add locales to "
 "your multistrap configuration file in the 'packages' option."
@@ -683,7 +703,7 @@ msgstr ""
 "seu ficheiro de configuração multistrap na opção 'packages')."
 
 #. type: textblock
-#: pod/multistrap:234
+#: pod/multistrap:244
 msgid ""
 "A native multistrap can be used directly with chroot, so C<multistrap> runs "
 "C<dpkg --configure -a> at the end of the multistrap process."
@@ -692,13 +712,13 @@ msgstr ""
 "C<multistrap> corra C<dpkg --configure -a> no final do processo multistrap."
 
 #. type: =head1
-#: pod/multistrap:238
+#: pod/multistrap:248
 #, fuzzy
 msgid "Cascading configuration"
 msgstr "Configuração"
 
 #. type: textblock
-#: pod/multistrap:240
+#: pod/multistrap:250
 msgid ""
 "To support multiple variants of a basic (common) configuration, "
 "C<multistrap> allows configuration files to include other (more general)  "
@@ -708,12 +728,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:246
+#: pod/multistrap:256
 msgid "Base file:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:248
+#: pod/multistrap:258
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/crosschroot.conf\n"
@@ -721,12 +741,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:250
+#: pod/multistrap:260
 msgid "Variations:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:252
+#: pod/multistrap:262
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/armel.conf\n"
@@ -734,7 +754,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:254
+#: pod/multistrap:264
 msgid ""
 "Specifying just the armel.conf file will get the rest of the settings from "
 "crosschroot.conf so that common changes only need to be made in a single "
@@ -742,7 +762,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:258
+#: pod/multistrap:268
 msgid ""
 "It is B<strongly> recommended that any changes to the configuration files "
 "involved in any particular cascade are tested using the C<--simulate> option "
@@ -754,13 +774,13 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:266
+#: pod/multistrap:276
 #, fuzzy
 msgid "Machine:variant support"
 msgstr "Variantes de máquina"
 
 #. type: textblock
-#: pod/multistrap:268
+#: pod/multistrap:278
 msgid ""
 "The old packages.conf variables from emsandbox can all be converted into "
 "C<multistrap> configuration variables. The machine:variant support in "
@@ -768,7 +788,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:273
+#: pod/multistrap:283
 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 "
@@ -779,7 +799,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:281
+#: pod/multistrap:291
 msgid ""
 "One advantage of using machine:variant support is that the entire "
 "rootfilesystem can be managed by a single call to multistrap - this is "
@@ -787,14 +807,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:285
+#: pod/multistrap:295
 msgid ""
 "To enable machine:variant support, specify the path to the scripts to be "
 "called in the variant configuration file (General section):"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:288
+#: pod/multistrap:298
 #, no-wrap
 msgid ""
 " [General]\n"
@@ -805,19 +825,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:294
+#: pod/multistrap:304
 msgid "Restricting package selection"
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:296
+#: pod/multistrap:306
 msgid ""
 "C<multistrap> includes Required packages by default, the current list of "
 "packages can be seen using:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:299
+#: pod/multistrap:309
 #, no-wrap
 msgid ""
 " grep-available  -FPriority 'required' -sPackage\n"
@@ -825,7 +845,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:301
+#: pod/multistrap:311
 msgid ""
 "If the OmitRequired option is set to true, these packages will not be added "
 "- whilst useful, this option can easily lead to a useless rootfs. Only the "
@@ -834,12 +854,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:307
+#: pod/multistrap:317
 msgid "Collecting packages from specific codenames/suites."
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:309
+#: pod/multistrap:319
 msgid ""
 "Packages specified explicitly in the configuration sections will be passed "
 "to apt as package/codename so that the configuration controls which version "
@@ -848,7 +868,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:314
+#: pod/multistrap:324
 msgid ""
 "When using this support in Lenny, ensure that each section uses the codename "
 "(etch, lenny, squeeze, sid) instead of the suite (oldstable, stable, "
@@ -857,12 +877,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:319
+#: pod/multistrap:329
 msgid "Recommends TOIMPLEMENT:"
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:321
+#: pod/multistrap:331
 msgid "Default recommends OFF option to set it as on."
 msgstr ""