From d72e1f64556630462e20c5fcd287655b3baa38f1 Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Wed, 5 May 2010 19:15:05 +0000
Subject: [PATCH] upload this one to experimental first, into unstable once
 translations updated.

git-svn-id: http://emdebian.org/svn/current@7185 563faec7-e20c-0410-992a-a66f704d0ccd
---
 debian/changelog |   4 +-
 doc/po/fr.po     | 351 +++++++++++++++++++++++++----------------------
 doc/po/pt.po     | 351 +++++++++++++++++++++++++----------------------
 3 files changed, 376 insertions(+), 330 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ebd9b3..1ff6b83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-multistrap (2.1.4) unstable; urgency=low
+multistrap (2.1.4) experimental; urgency=low
 
   * Add support for configurable single cross-toolchains in
     the chroot - using the dpkg-cross default_arch, if any.
@@ -7,7 +7,7 @@ multistrap (2.1.4) unstable; urgency=low
   * Clarify error reporting in the --simulate option, warn if
     sections are not defined. (Closes: #579627)
 
- -- Neil Williams <codehelp@debian.org>  Wed, 05 May 2010 20:08:44 +0100
+ -- Neil Williams <codehelp@debian.org>  Wed, 05 May 2010 20:13:27 +0100
 
 multistrap (2.1.3) experimental; urgency=low
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 5ada92e..c46980a 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-05-03 17:16+0200\n"
+"POT-Creation-Date: 2010-05-05 20:12+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"
@@ -24,7 +24,7 @@ msgstr "Nom"
 #. type: textblock
 #: pod/multistrap:5
 #, fuzzy
-msgid "multistrap - extends debootstrap for multiple repository support"
+msgid "multistrap - debootstrap replacement for multiple repository support"
 msgstr ""
 "em_multistrap - Ajoute à debootstrap la capacité de gérer plusieurs dépôts"
 
@@ -38,6 +38,7 @@ msgstr "Synopsis"
 #, fuzzy, no-wrap
 msgid ""
 " multistrap [-a ARCH] [-d DIR] -f CONFIG_FILE\n"
+" multistrap [--simulate] -f CONFIG_FILE\n"
 " multistrap -?|-h|--help|--version\n"
 "\n"
 msgstr ""
@@ -46,23 +47,23 @@ msgstr ""
 "\n"
 
 #. type: =head1
-#: pod/multistrap:12 device-table.pl:145
+#: pod/multistrap:13 device-table.pl:145
 msgid "Options"
 msgstr "Options"
 
 #. type: textblock
-#: pod/multistrap:14
+#: pod/multistrap:15
 msgid ""
 "--dry-run - collate all the configuration settings and output a bare summary."
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:17
+#: pod/multistrap:18
 msgid "--simulate - same as --dry-run"
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:19
+#: pod/multistrap:20
 #, fuzzy
 #| msgid "(These options can also be set in the configuration file.)"
 msgid "(The following options can also be set in the configuration file.)"
@@ -71,7 +72,7 @@ msgstr ""
 "configuration.)"
 
 #. type: textblock
-#: pod/multistrap:21
+#: pod/multistrap:22
 msgid ""
 "--tidy-up - remove apt cache data, downloaded Packages files and the apt "
 "package cache. Same as cleanup=true."
@@ -80,7 +81,7 @@ msgstr ""
 "téléchargés et le cache des paquets apt. Identique à cleanup=true."
 
 #. type: textblock
-#: pod/multistrap:24
+#: pod/multistrap:25
 msgid ""
 "--no-auth - allow the use of unauthenticated repositories. Same as "
 "noauth=true"
@@ -89,19 +90,19 @@ msgstr ""
 "noauth=true"
 
 #. type: textblock
-#: pod/multistrap:27
+#: pod/multistrap:28
 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:32
+#: pod/multistrap:33
 msgid "Description"
 msgstr "Description"
 
 #. type: textblock
-#: pod/multistrap:34
+#: pod/multistrap:35
 #, fuzzy
 msgid ""
 "multistrap provides a debootstrap-like method based on apt and extended to "
@@ -115,21 +116,25 @@ msgstr ""
 "supplémentaires et le miroir à utiliser pour chaque debootstrap."
 
 #. type: textblock
-#: pod/multistrap:39
+#: pod/multistrap:40
+#, fuzzy
+#| msgid ""
+#| "The aim is to create a complete debootstrap with all packages installed "
+#| "and configured, instead of just the base system."
 msgid ""
-"The aim is to create a complete debootstrap with all packages installed and "
-"configured, instead of just the base system."
+"The aim is to create a complete bootstrap / root filesystem with all "
+"packages installed and configured, instead of just the base system."
 msgstr ""
 "Le but est de créer un debootstrap complet avec tous les paquets installés "
 "et configurés, plutôt que de créer uniquement le système de base."
 
 #. type: textblock
-#: pod/multistrap:42
+#: pod/multistrap:44
 msgid "Example configuration:"
 msgstr "Exemple de configuration :"
 
 #. type: verbatim
-#: pod/multistrap:44
+#: pod/multistrap:46
 #, fuzzy, no-wrap
 #| msgid ""
 #| " [General]\n"
@@ -167,7 +172,7 @@ msgid ""
 " # 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=Grip Updates\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"
@@ -197,7 +202,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: pod/multistrap:65
+#: pod/multistrap:67
 #, no-wrap
 msgid ""
 " [Debian]\n"
@@ -215,7 +220,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:71
+#: pod/multistrap:73
 msgid ""
 "This will result in a completely normal debootstrap of Debian lenny from the "
 "specified mirror, for armel in '/opt/multistrap/'."
@@ -224,7 +229,7 @@ msgstr ""
 "partir du miroir spécifié, pour armel dans « /opt/multistrap/ »."
 
 #. type: textblock
-#: pod/multistrap:74
+#: pod/multistrap:76
 msgid ""
 "Specify a package to extend the multistrap to include that package and all "
 "dependencies."
@@ -233,124 +238,88 @@ msgstr ""
 "toutes ses dépendances."
 
 #. type: textblock
-#: pod/multistrap:77
+#: pod/multistrap:79
+#, fuzzy
+#| msgid ""
+#| "Specify more debootstraps by adding new sections. Section names are used "
+#| "in the debootstrap general option."
 msgid ""
-"Specify more debootstraps by adding new sections. Section names are used in "
-"the debootstrap general option."
+"Specify more bootstraps by adding new sections. Section names are used in "
+"the bootstrap general option."
 msgstr ""
 "Spécifiez plus de debootstraps en ajoutant de nouvelles sections. Les noms "
 "de sections sont utilisés dans l'option générale de debootstrap."
 
 #. type: textblock
-#: pod/multistrap:80
+#: pod/multistrap:82
 msgid "Section names are case-insensitive."
 msgstr "La casse des lettres n'est pas importante dans les noms de section."
 
 #. type: textblock
-#: pod/multistrap:82
-msgid "e.g. change"
-msgstr "par exemple, changer"
-
-#. type: verbatim
 #: pod/multistrap:84
-#, no-wrap
-msgid ""
-" debootstrap=Debian\n"
-"\n"
+#, fuzzy
+#| msgid ""
+#| "All dependencies are resolved only by apt, using all configured "
+#| "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 "
+"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."
 msgstr ""
-"debootstrap=Debian\n"
-"\n"
+"Toutes les dépendances sont déterminées uniquement par apt, en utilisant "
+"tous les dépôts configurés, pour utiliser uniquement les dépendances les "
+"plus récentes et les plus appropriées. Notez que multistrap désactive "
+"Install-Recommends. Si le multistrap a besoin d'un paquet qui est seulement "
+"recommandé, ce paquet devra être indiqué explicitement à la ligne des "
+"paquets."
 
 #. type: textblock
-#: pod/multistrap:86
-msgid "to"
-msgstr "en"
-
-#. type: verbatim
-#: pod/multistrap:88
-#, no-wrap
+#: pod/multistrap:91
 msgid ""
-" debootstrap=Grip\n"
-" \n"
-msgstr ""
-" debootstrap=Grip\n"
-" \n"
-
-#. type: verbatim
-#: pod/multistrap:90
-#, no-wrap
-msgid ""
-"then add the new section for Grip:\n"
-" \n"
-msgstr ""
-"Puis ajoutez la nouvelle section de Grip :\n"
-" \n"
-
-#. type: verbatim
-#: pod/multistrap:92
-#, no-wrap
-msgid ""
-" [Grip]\n"
-" packages=locales\n"
-" keyring=emdebian-archive-keyring\n"
-" source=http://www.emdebian.org/grip\n"
-" suite=lenny\n"
-"\n"
+"'Architecture' and 'directory' can be overridden on the command line.  Other "
+"general options have command line options, except debootstrap itself."
 msgstr ""
-" [Grip]\n"
-" packages=locales\n"
-" keyring=emdebian-archive-keyring\n"
-" source=http://www.emdebian.org/grip\n"
-" suite=lenny\n"
-"\n"
+"« Architecture » et « directory » peuvent être modifiés en ligne de commande. "
+"D'autres options générales peuvent ausi être indiquées en ligne de commande, "
+"sauf debootstrap."
 
 #. type: textblock
-#: pod/multistrap:98
+#: pod/multistrap:97
 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 "
-"dependencies in Debian 5.0 Lenny, allowing you to add any package(s) you "
-"need from Debian that are not yet in Emdebian Grip."
+"C<aptsources> lists the sections which should be used to create the F</etc/"
+"apt/sources.list.d/multistrap.list> apt sources in the final system. Not all "
+"C<aptsources> have to appear in the C<bootstrap> section if you have some "
+"internal or local sources which are not accessible to the installed root "
+"filesystem."
 msgstr ""
-"Paramètrer Grip au lieu de Debian dans l'option de debootstrap, comme ci-"
-"dessus, fournira un système de base Emdebian Grip 1.0 et localisera toutes "
-"les dépendances manquantes dans Debian 5.0 Lenny. Cela permet d'ajouter tous "
-"les paquets issus de Debian dont vous avez besoin et qui ne sont pas encore "
-"dans Emdebian Grip."
 
 #. type: textblock
 #: 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. "
-"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."
+"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."
 msgstr ""
-"Toutes les dépendances sont déterminées uniquement par apt, en utilisant "
-"tous les dépôts configurés, pour utiliser uniquement les dépendances les "
-"plus récentes et les plus appropriées. Notez que multistrap désactive "
-"Install-Recommends. Si le multistrap a besoin d'un paquet qui est seulement "
-"recommandé, ce paquet devra être indiqué explicitement à la ligne des "
-"paquets."
 
 #. type: textblock
-#: pod/multistrap:110
+#: pod/multistrap:107
 msgid ""
-"'Architecture' and 'directory' can be overridden on the command line.  Other "
-"general options have command line options, except debootstrap itself."
+"Make sure C<bootstrap> lists all sections you need for apt to be able to "
+"find all the packages to be unpacked for the multistrap."
 msgstr ""
-"« Architecture » et « directory » peuvent être modifiés en ligne de commande. "
-"D'autres options générales peuvent ausi être indiquées en ligne de commande, "
-"sauf debootstrap."
 
 #. type: =head1
-#: pod/multistrap:114
+#: pod/multistrap:110
 msgid "General settings:"
 msgstr "Paramètres généraux :"
 
 #. type: textblock
-#: pod/multistrap:116
+#: pod/multistrap:112
 msgid ""
 "'directory' specifies the top level directory where the debootstrap will be "
 "created - it is not packed into a .tgz once complete."
@@ -359,13 +328,13 @@ msgstr ""
 "sera créé - il n'est pas empaqueté en un .tgz une fois complété."
 
 #. type: textblock
-#: pod/multistrap:119
+#: pod/multistrap:115
 #, 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:121
+#: pod/multistrap:117
 msgid ""
 "multistrap also implements the machine:variant support originally used in "
 "Emdebian Crush, although in a different implementation. Using the cascading "
@@ -374,19 +343,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:126
+#: pod/multistrap:122
 msgid ""
 "Setting C<tarballname> to true also packs up the final filesystem into a "
 "tarball."
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:129
+#: pod/multistrap:125
 msgid "Secure Apt"
 msgstr "Apt sécurisé"
 
 #. type: textblock
-#: pod/multistrap:131
+#: pod/multistrap:127
 msgid ""
 "To use authenticated apt repositories, multistrap either needs to be able to "
 "install an appropriate keyring package from the existing apt sources "
@@ -399,7 +368,7 @@ msgstr ""
 "en utilisant apt-key *sur le système hôte*."
 
 #. type: textblock
-#: pod/multistrap:136
+#: pod/multistrap:132
 #, fuzzy
 msgid ""
 "If relevant packages exist, specify them in the 'keyring' option for each "
@@ -412,7 +381,7 @@ msgstr ""
 "ainsi le dépôt pourra être authentifié avant de télécharger des paquets."
 
 #. type: textblock
-#: pod/multistrap:141
+#: pod/multistrap:137
 msgid ""
 "Note that *all* repositories to be used with multistrap must be "
 "authenticated or apt will fail. Similarly, secure apt can only be disabled "
@@ -430,7 +399,7 @@ msgstr ""
 "de clés, si vous configurez apt-key correctement."
 
 #. type: textblock
-#: pod/multistrap:149
+#: pod/multistrap:145
 msgid ""
 "The keyring package(s) will also be installed inside the multistrap "
 "environment to match the installed apt sources for the multistrap."
@@ -440,7 +409,7 @@ msgstr ""
 "installés du multistrap."
 
 #. type: textblock
-#: pod/multistrap:152
+#: pod/multistrap:148
 msgid ""
 "All configuration of apt-key needs to be done for the machine running "
 "multistrap itself."
@@ -449,12 +418,12 @@ msgstr ""
 "multistrap."
 
 #. type: =head1
-#: pod/multistrap:155
+#: pod/multistrap:151
 msgid "State"
 msgstr "État"
 
 #. type: textblock
-#: pod/multistrap:157
+#: pod/multistrap:153
 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."
@@ -464,12 +433,12 @@ msgstr ""
 "s'était arrêté."
 
 #. type: =head1
-#: pod/multistrap:160
+#: pod/multistrap:156
 msgid "Configuration"
 msgstr "Configuration"
 
 #. type: textblock
-#: pod/multistrap:162
+#: pod/multistrap:158
 msgid ""
 "multistrap unpacks the downloaded packages but other stages of system "
 "configuration are not attempted. Examples include:"
@@ -478,7 +447,7 @@ msgstr ""
 "configuration du système ne sont pas tentées. Les exemples incluent : "
 
 #. type: verbatim
-#: pod/multistrap:165
+#: pod/multistrap:161
 #, no-wrap
 msgid ""
 " /etc/inittab\n"
@@ -504,7 +473,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:175
+#: pod/multistrap:171
 msgid ""
 "Any device-specific device nodes will also need to be created using MAKEDEV."
 msgstr ""
@@ -512,7 +481,7 @@ msgstr ""
 "utilisant MAKEDEV."
 
 #. type: textblock
-#: pod/multistrap:178
+#: pod/multistrap:174
 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 "
@@ -520,7 +489,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:183
+#: pod/multistrap:179
 msgid ""
 "Once multistrap has successfully created the basic file and directory "
 "layout, other device-specific scripts are needed before the filesystem can "
@@ -532,7 +501,7 @@ msgstr ""
 "le périphérique cible."
 
 #. type: textblock
-#: pod/multistrap:188
+#: pod/multistrap:184
 msgid ""
 "Once installed, the packages themselves need to be configured using the "
 "package maintainer scripts and C<dpkg --configure -a>, unless this is a "
@@ -543,7 +512,7 @@ msgstr ""
 "moins qu'il ne s'agisse d'un multistrap natif."
 
 #. type: textblock
-#: pod/multistrap:192
+#: pod/multistrap:188
 msgid ""
 "For C<dpkg> to work, F</proc> and F</sysfs> must be mounted (or mountable), "
 "F</dev/pts> is also recommended."
@@ -552,17 +521,17 @@ msgstr ""
 "montés (ou être montables), F</dev/pts> est également recommandé."
 
 #. type: textblock
-#: pod/multistrap:195
+#: pod/multistrap:191
 msgid "See also: http://wiki.debian.org/Multistrap"
 msgstr "Voir aussi : http://wiki.debian.org/Multistrap"
 
 #. type: =head1
-#: pod/multistrap:197
+#: pod/multistrap:193
 msgid "Environment"
 msgstr "Environnement"
 
 #. type: textblock
-#: pod/multistrap:199
+#: pod/multistrap:195
 msgid ""
 "To configure the unpacked packages (whether in native or cross mode), "
 "certain environment variables are needed:"
@@ -571,7 +540,7 @@ msgstr ""
 "natif), certaines variables d'environnements sont nécessaires :"
 
 #. type: textblock
-#: pod/multistrap:202
+#: pod/multistrap:198
 msgid ""
 "Debconf needs to be told to accept that user interaction is not desired:"
 msgstr ""
@@ -579,7 +548,7 @@ msgstr ""
 "pas souhaitée : "
 
 #. type: verbatim
-#: pod/multistrap:205
+#: pod/multistrap:201
 #, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
@@ -589,7 +558,7 @@ msgstr ""
 " \n"
 
 #. type: textblock
-#: pod/multistrap:207
+#: pod/multistrap:203
 msgid ""
 "Perl needs to be told to accept that no locales are available inside the "
 "chroot and not to complain:"
@@ -598,7 +567,7 @@ msgstr ""
 "l'intérieur du chroot et de ne pas se plaindre :"
 
 #. type: verbatim
-#: pod/multistrap:210
+#: pod/multistrap:206
 #, no-wrap
 msgid ""
 " LC_ALL=C LANGUAGE=C LANG=C\n"
@@ -608,17 +577,17 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:212
+#: pod/multistrap:208
 msgid "Then, dpkg can configure the packages:"
 msgstr "Puis, dpkg peut configurer les paquets :"
 
 #. type: textblock
-#: pod/multistrap:214
+#: pod/multistrap:210
 msgid "chroot method (PATH = top directory of chroot):"
 msgstr "méthode chroot (PATH = le répertoire de base du chroot) :"
 
 #. type: verbatim
-#: pod/multistrap:216
+#: pod/multistrap:212
 #, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \\\n"
@@ -630,12 +599,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:219
+#: pod/multistrap:215
 msgid "at a login shell:"
 msgstr "dans un interpréteur de commandes de connexion : "
 
 #. type: verbatim
-#: pod/multistrap:221
+#: pod/multistrap:217
 #, no-wrap
 msgid ""
 " # export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
@@ -649,19 +618,19 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:225
+#: pod/multistrap:221
 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:227
+#: pod/multistrap:223
 msgid "Native mode - multistrap"
 msgstr "mode natif - multistrap"
 
 #. type: textblock
-#: pod/multistrap:229
+#: pod/multistrap:225
 #, fuzzy
 msgid ""
 "multistrap was not intended for native support, it was developed for cross "
@@ -674,7 +643,7 @@ msgstr ""
 "par apt."
 
 #. type: textblock
-#: pod/multistrap:233
+#: pod/multistrap:229
 msgid ""
 "In native mode, various post-multistrap operations are likely to be needed "
 "that debootstrap would do for you:"
@@ -683,7 +652,7 @@ msgstr ""
 "pour vous sont probablement nécessaires :"
 
 #. type: verbatim
-#: pod/multistrap:236
+#: pod/multistrap:232
 #, no-wrap
 msgid ""
 " 1. copy /etc/hosts into the chroot\n"
@@ -697,7 +666,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:240
+#: pod/multistrap:236
 msgid ""
 "(An alternative to unset the localisation variables is to add locales to "
 "your multistrap configuration file in the 'packages' option."
@@ -707,7 +676,7 @@ msgstr ""
 "»."
 
 #. type: textblock
-#: pod/multistrap:244
+#: pod/multistrap:240
 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."
@@ -717,13 +686,13 @@ msgstr ""
 "multistrap."
 
 #. type: =head1
-#: pod/multistrap:248
+#: pod/multistrap:244
 #, fuzzy
 msgid "Cascading configuration"
 msgstr "Configuration"
 
 #. type: textblock
-#: pod/multistrap:250
+#: pod/multistrap:246
 msgid ""
 "To support multiple variants of a basic (common) configuration, "
 "C<multistrap> allows configuration files to include other (more general)  "
@@ -733,12 +702,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:256
+#: pod/multistrap:252
 msgid "Base file:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:258
+#: pod/multistrap:254
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/crosschroot.conf\n"
@@ -746,12 +715,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:260
+#: pod/multistrap:256
 msgid "Variations:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:262
+#: pod/multistrap:258
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/armel.conf\n"
@@ -759,7 +728,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:264
+#: pod/multistrap:260
 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 "
@@ -767,7 +736,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:268
+#: pod/multistrap:264
 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 "
@@ -779,13 +748,13 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:276
+#: pod/multistrap:272
 #, fuzzy
 msgid "Machine:variant support"
 msgstr "Variantes de Machines"
 
 #. type: textblock
-#: pod/multistrap:278
+#: pod/multistrap:274
 msgid ""
 "The old packages.conf variables from emsandbox can all be converted into "
 "C<multistrap> configuration variables. The machine:variant support in "
@@ -793,7 +762,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:283
+#: pod/multistrap:279
 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 "
@@ -804,7 +773,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:291
+#: pod/multistrap:287
 msgid ""
 "One advantage of using machine:variant support is that the entire "
 "rootfilesystem can be managed by a single call to multistrap - this is "
@@ -812,14 +781,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:295
+#: pod/multistrap:291
 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:298
+#: pod/multistrap:294
 #, no-wrap
 msgid ""
 " [General]\n"
@@ -830,19 +799,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:304
+#: pod/multistrap:300
 msgid "Restricting package selection"
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:306
+#: pod/multistrap:302
 msgid ""
 "C<multistrap> includes Required packages by default, the current list of "
 "packages can be seen using:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:309
+#: pod/multistrap:305
 #, no-wrap
 msgid ""
 " grep-available  -FPriority 'required' -sPackage\n"
@@ -850,7 +819,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:311
+#: pod/multistrap:307
 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 "
@@ -859,12 +828,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:317
+#: pod/multistrap:313
 msgid "Collecting packages from specific codenames/suites."
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:319
+#: pod/multistrap:315
 msgid ""
 "Packages specified explicitly in the configuration sections will be passed "
 "to apt as package/codename so that the configuration controls which version "
@@ -873,7 +842,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:324
+#: pod/multistrap:320
 msgid ""
 "When using this support in Lenny, ensure that each section uses the codename "
 "(etch, lenny, squeeze, sid) instead of the suite (oldstable, stable, "
@@ -882,12 +851,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:329
+#: pod/multistrap:325
 msgid "Recommends TOIMPLEMENT:"
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:331
+#: pod/multistrap:327
 msgid "Default recommends OFF option to set it as on."
 msgstr ""
 
@@ -935,6 +904,60 @@ msgid ""
 "fakeroot option to drop the internal fakeroot usage."
 msgstr ""
 
+#~ msgid "e.g. change"
+#~ msgstr "par exemple, changer"
+
+#~ msgid ""
+#~ " debootstrap=Debian\n"
+#~ "\n"
+#~ msgstr ""
+#~ "debootstrap=Debian\n"
+#~ "\n"
+
+#~ msgid "to"
+#~ msgstr "en"
+
+#~ msgid ""
+#~ " debootstrap=Grip\n"
+#~ " \n"
+#~ msgstr ""
+#~ " debootstrap=Grip\n"
+#~ " \n"
+
+#~ msgid ""
+#~ "then add the new section for Grip:\n"
+#~ " \n"
+#~ msgstr ""
+#~ "Puis ajoutez la nouvelle section de Grip :\n"
+#~ " \n"
+
+#~ msgid ""
+#~ " [Grip]\n"
+#~ " packages=locales\n"
+#~ " keyring=emdebian-archive-keyring\n"
+#~ " source=http://www.emdebian.org/grip\n"
+#~ " suite=lenny\n"
+#~ "\n"
+#~ msgstr ""
+#~ " [Grip]\n"
+#~ " packages=locales\n"
+#~ " keyring=emdebian-archive-keyring\n"
+#~ " source=http://www.emdebian.org/grip\n"
+#~ " suite=lenny\n"
+#~ "\n"
+
+#~ 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 "
+#~ "dependencies in Debian 5.0 Lenny, allowing you to add any package(s) you "
+#~ "need from Debian that are not yet in Emdebian Grip."
+#~ msgstr ""
+#~ "Paramètrer Grip au lieu de Debian dans l'option de debootstrap, comme ci-"
+#~ "dessus, fournira un système de base Emdebian Grip 1.0 et localisera "
+#~ "toutes les dépendances manquantes dans Debian 5.0 Lenny. Cela permet "
+#~ "d'ajouter tous les paquets issus de Debian dont vous avez besoin et qui "
+#~ "ne sont pas encore dans Emdebian Grip."
+
 #, fuzzy
 #~| msgid ""
 #~| "em_multistrap does not currently implement the machine:variant support "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index ca0c817..975f5d5 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-05-03 17:16+0200\n"
+"POT-Creation-Date: 2010-05-05 20:12+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"
@@ -24,7 +24,7 @@ msgstr "Nome"
 #. type: textblock
 #: pod/multistrap:5
 #, fuzzy
-msgid "multistrap - extends debootstrap for multiple repository support"
+msgid "multistrap - debootstrap replacement for multiple repository support"
 msgstr ""
 "em_multistrap - estende o debootstrap para suporte a múltiplos repositórios"
 
@@ -38,6 +38,7 @@ msgstr "Sinopse"
 #, fuzzy, no-wrap
 msgid ""
 " multistrap [-a ARCH] [-d DIR] -f CONFIG_FILE\n"
+" multistrap [--simulate] -f CONFIG_FILE\n"
 " multistrap -?|-h|--help|--version\n"
 "\n"
 msgstr ""
@@ -46,30 +47,30 @@ msgstr ""
 "\n"
 
 #. type: =head1
-#: pod/multistrap:12 device-table.pl:145
+#: pod/multistrap:13 device-table.pl:145
 msgid "Options"
 msgstr "Opções"
 
 #. type: textblock
-#: pod/multistrap:14
+#: pod/multistrap:15
 msgid ""
 "--dry-run - collate all the configuration settings and output a bare summary."
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:17
+#: pod/multistrap:18
 msgid "--simulate - same as --dry-run"
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:19
+#: pod/multistrap:20
 #, 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:21
+#: pod/multistrap:22
 msgid ""
 "--tidy-up - remove apt cache data, downloaded Packages files and the apt "
 "package cache. Same as cleanup=true."
@@ -78,7 +79,7 @@ msgstr ""
 "e a cache de pacotes do apt. O mesmo que cleanup=true."
 
 #. type: textblock
-#: pod/multistrap:24
+#: pod/multistrap:25
 msgid ""
 "--no-auth - allow the use of unauthenticated repositories. Same as "
 "noauth=true"
@@ -87,19 +88,19 @@ msgstr ""
 "noauth=true"
 
 #. type: textblock
-#: pod/multistrap:27
+#: pod/multistrap:28
 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:32
+#: pod/multistrap:33
 msgid "Description"
 msgstr "Descrição"
 
 #. type: textblock
-#: pod/multistrap:34
+#: pod/multistrap:35
 #, fuzzy
 msgid ""
 "multistrap provides a debootstrap-like method based on apt and extended to "
@@ -113,21 +114,25 @@ msgstr ""
 "arquitectura, pacotes extra e o mirror a usar para cada debootstrap."
 
 #. type: textblock
-#: pod/multistrap:39
+#: pod/multistrap:40
+#, fuzzy
+#| msgid ""
+#| "The aim is to create a complete debootstrap with all packages installed "
+#| "and configured, instead of just the base system."
 msgid ""
-"The aim is to create a complete debootstrap with all packages installed and "
-"configured, instead of just the base system."
+"The aim is to create a complete bootstrap / root filesystem with all "
+"packages installed and configured, instead of just the base system."
 msgstr ""
 "O objectivo é criar um debootstrap completo com todos os pacotes instalados "
 "e configurados, e vez de apenas o sistema base."
 
 #. type: textblock
-#: pod/multistrap:42
+#: pod/multistrap:44
 msgid "Example configuration:"
 msgstr "Exemplo de configuração:"
 
 #. type: verbatim
-#: pod/multistrap:44
+#: pod/multistrap:46
 #, fuzzy, no-wrap
 #| msgid ""
 #| " [General]\n"
@@ -165,7 +170,7 @@ msgid ""
 " # 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=Grip Updates\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"
@@ -195,7 +200,7 @@ msgstr ""
 " \n"
 
 #. type: verbatim
-#: pod/multistrap:65
+#: pod/multistrap:67
 #, no-wrap
 msgid ""
 " [Debian]\n"
@@ -213,7 +218,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:71
+#: pod/multistrap:73
 msgid ""
 "This will result in a completely normal debootstrap of Debian lenny from the "
 "specified mirror, for armel in '/opt/multistrap/'."
@@ -222,7 +227,7 @@ msgstr ""
 "partir do mirror especificado, para armel em '/opt/multistrap/'."
 
 #. type: textblock
-#: pod/multistrap:74
+#: pod/multistrap:76
 msgid ""
 "Specify a package to extend the multistrap to include that package and all "
 "dependencies."
@@ -231,124 +236,88 @@ msgstr ""
 "todas as dependências."
 
 #. type: textblock
-#: pod/multistrap:77
+#: pod/multistrap:79
+#, fuzzy
+#| msgid ""
+#| "Specify more debootstraps by adding new sections. Section names are used "
+#| "in the debootstrap general option."
 msgid ""
-"Specify more debootstraps by adding new sections. Section names are used in "
-"the debootstrap general option."
+"Specify more bootstraps by adding new sections. Section names are used in "
+"the bootstrap general option."
 msgstr ""
 "Especifica mais debootstraps ao adicionar novas secções. Os nomes das "
 "secções são usados na opção geral do debootstrap."
 
 #. type: textblock
-#: pod/multistrap:80
+#: pod/multistrap:82
 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:82
-msgid "e.g. change"
-msgstr "ex. change"
-
-#. type: verbatim
 #: pod/multistrap:84
-#, no-wrap
-msgid ""
-" debootstrap=Debian\n"
-"\n"
+#, fuzzy
+#| msgid ""
+#| "All dependencies are resolved only by apt, using all configured "
+#| "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 "
+"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."
 msgstr ""
-" debootstrap=Debian\n"
-"\n"
+"Todas as dependências são resolvidas apenas pelo apt, usando todos os "
+"repositórios configurados, para usar apenas as dependências mais recentes e "
+"apropriadas. Note que o multistrap desliga a Install-Recommends portanto se "
+"o multistrap precisar de um pacote que é apenas uma dependência "
+"'Recommended', o pacote recomendado precisa de ser especificado "
+"explicitamente na linha de pacotes."
 
 #. type: textblock
-#: pod/multistrap:86
-msgid "to"
-msgstr "para"
-
-#. type: verbatim
-#: pod/multistrap:88
-#, no-wrap
+#: pod/multistrap:91
 msgid ""
-" debootstrap=Grip\n"
-" \n"
-msgstr ""
-" debootstrap=Grip\n"
-" \n"
-
-#. type: verbatim
-#: pod/multistrap:90
-#, no-wrap
-msgid ""
-"then add the new section for Grip:\n"
-" \n"
-msgstr ""
-"depois adicione a nova secção para o Grip:\n"
-" \n"
-
-#. type: verbatim
-#: pod/multistrap:92
-#, no-wrap
-msgid ""
-" [Grip]\n"
-" packages=locales\n"
-" keyring=emdebian-archive-keyring\n"
-" source=http://www.emdebian.org/grip\n"
-" suite=lenny\n"
-"\n"
+"'Architecture' and 'directory' can be overridden on the command line.  Other "
+"general options have command line options, except debootstrap itself."
 msgstr ""
-" [Grip]\n"
-" packages=locales\n"
-" keyring=emdebian-archive-keyring\n"
-" source=http://www.emdebian.org/grip\n"
-" suite=lenny\n"
-"\n"
+"'Architecture' e 'directory' podem ser sobrepostas na linha de comandos. "
+"Outras opções gerais têm opções de linha de comandos, excepto o próprio "
+"debootstrap."
 
 #. type: textblock
-#: pod/multistrap:98
+#: pod/multistrap:97
 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 "
-"dependencies in Debian 5.0 Lenny, allowing you to add any package(s) you "
-"need from Debian that are not yet in Emdebian Grip."
+"C<aptsources> lists the sections which should be used to create the F</etc/"
+"apt/sources.list.d/multistrap.list> apt sources in the final system. Not all "
+"C<aptsources> have to appear in the C<bootstrap> section if you have some "
+"internal or local sources which are not accessible to the installed root "
+"filesystem."
 msgstr ""
-"Definir Grip em vez de Debian na opção do debootstrap, como em cima, irá "
-"disponibilizar um sistema base a partir de Emdebian Grip 1.0 e localizar "
-"quaisquer dependências em falta em Debian 5.0 Lenny, permitindo-lhe "
-"adicionar quaisquer pacote(s) que precise de Debian e que não estão ainda em "
-"Emdebian Grip."
 
 #. type: textblock
 #: 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. "
-"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."
+"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."
 msgstr ""
-"Todas as dependências são resolvidas apenas pelo apt, usando todos os "
-"repositórios configurados, para usar apenas as dependências mais recentes e "
-"apropriadas. Note que o multistrap desliga a Install-Recommends portanto se "
-"o multistrap precisar de um pacote que é apenas uma dependência "
-"'Recommended', o pacote recomendado precisa de ser especificado "
-"explicitamente na linha de pacotes."
 
 #. type: textblock
-#: pod/multistrap:110
+#: pod/multistrap:107
 msgid ""
-"'Architecture' and 'directory' can be overridden on the command line.  Other "
-"general options have command line options, except debootstrap itself."
+"Make sure C<bootstrap> lists all sections you need for apt to be able to "
+"find all the packages to be unpacked for the multistrap."
 msgstr ""
-"'Architecture' e 'directory' podem ser sobrepostas na linha de comandos. "
-"Outras opções gerais têm opções de linha de comandos, excepto o próprio "
-"debootstrap."
 
 #. type: =head1
-#: pod/multistrap:114
+#: pod/multistrap:110
 msgid "General settings:"
 msgstr "Definições gerais:"
 
 #. type: textblock
-#: pod/multistrap:116
+#: pod/multistrap:112
 msgid ""
 "'directory' specifies the top level directory where the debootstrap will be "
 "created - it is not packed into a .tgz once complete."
@@ -357,14 +326,14 @@ msgstr ""
 "ser criado - não é empacotado em um .tgz depois de completo."
 
 #. type: textblock
-#: pod/multistrap:119
+#: pod/multistrap:115
 #, 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:121
+#: pod/multistrap:117
 msgid ""
 "multistrap also implements the machine:variant support originally used in "
 "Emdebian Crush, although in a different implementation. Using the cascading "
@@ -373,19 +342,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:126
+#: pod/multistrap:122
 msgid ""
 "Setting C<tarballname> to true also packs up the final filesystem into a "
 "tarball."
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:129
+#: pod/multistrap:125
 msgid "Secure Apt"
 msgstr "Segurança do Apt"
 
 #. type: textblock
-#: pod/multistrap:131
+#: pod/multistrap:127
 msgid ""
 "To use authenticated apt repositories, multistrap either needs to be able to "
 "install an appropriate keyring package from the existing apt sources "
@@ -398,7 +367,7 @@ msgstr ""
 "configuradas usando apt-key *na máquina do sistema*."
 
 #. type: textblock
-#: pod/multistrap:136
+#: pod/multistrap:132
 #, fuzzy
 msgid ""
 "If relevant packages exist, specify them in the 'keyring' option for each "
@@ -412,7 +381,7 @@ msgstr ""
 "pacotes sejam descarregados dele."
 
 #. type: textblock
-#: pod/multistrap:141
+#: pod/multistrap:137
 msgid ""
 "Note that *all* repositories to be used with multistrap must be "
 "authenticated or apt will fail. Similarly, secure apt can only be disabled "
@@ -430,7 +399,7 @@ msgstr ""
 "apt-key apropriadamente."
 
 #. type: textblock
-#: pod/multistrap:149
+#: pod/multistrap:145
 msgid ""
 "The keyring package(s) will also be installed inside the multistrap "
 "environment to match the installed apt sources for the multistrap."
@@ -439,7 +408,7 @@ msgstr ""
 "multistrap para coincidir com as fontes apt instaladas para o multistrap."
 
 #. type: textblock
-#: pod/multistrap:152
+#: pod/multistrap:148
 msgid ""
 "All configuration of apt-key needs to be done for the machine running "
 "multistrap itself."
@@ -448,12 +417,12 @@ msgstr ""
 "correndo o próprio multistrap."
 
 #. type: =head1
-#: pod/multistrap:155
+#: pod/multistrap:151
 msgid "State"
 msgstr "Estado"
 
 #. type: textblock
-#: pod/multistrap:157
+#: pod/multistrap:153
 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."
@@ -462,12 +431,12 @@ msgstr ""
 "prosseguir como normalmente e o apt irá tentar prosseguir de onde ficou."
 
 #. type: =head1
-#: pod/multistrap:160
+#: pod/multistrap:156
 msgid "Configuration"
 msgstr "Configuração"
 
 #. type: textblock
-#: pod/multistrap:162
+#: pod/multistrap:158
 msgid ""
 "multistrap unpacks the downloaded packages but other stages of system "
 "configuration are not attempted. Examples include:"
@@ -476,7 +445,7 @@ msgstr ""
 "outros estágios da configuração do sistema. Os exemplos incluem:"
 
 #. type: verbatim
-#: pod/multistrap:165
+#: pod/multistrap:161
 #, no-wrap
 msgid ""
 " /etc/inittab\n"
@@ -502,7 +471,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:175
+#: pod/multistrap:171
 msgid ""
 "Any device-specific device nodes will also need to be created using MAKEDEV."
 msgstr ""
@@ -510,7 +479,7 @@ msgstr ""
 "ser criados usando o MAKEDEV."
 
 #. type: textblock
-#: pod/multistrap:178
+#: pod/multistrap:174
 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 "
@@ -518,7 +487,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:183
+#: pod/multistrap:179
 msgid ""
 "Once multistrap has successfully created the basic file and directory "
 "layout, other device-specific scripts are needed before the filesystem can "
@@ -530,7 +499,7 @@ msgstr ""
 "de destino."
 
 #. type: textblock
-#: pod/multistrap:188
+#: pod/multistrap:184
 msgid ""
 "Once installed, the packages themselves need to be configured using the "
 "package maintainer scripts and C<dpkg --configure -a>, unless this is a "
@@ -541,7 +510,7 @@ msgstr ""
 "seja um multistrap nativo."
 
 #. type: textblock
-#: pod/multistrap:192
+#: pod/multistrap:188
 msgid ""
 "For C<dpkg> to work, F</proc> and F</sysfs> must be mounted (or mountable), "
 "F</dev/pts> is also recommended."
@@ -550,17 +519,17 @@ msgstr ""
 "(ou serem montáveis), também é recomendado F</dev/pts>."
 
 #. type: textblock
-#: pod/multistrap:195
+#: pod/multistrap:191
 msgid "See also: http://wiki.debian.org/Multistrap"
 msgstr "Veja também: http://wiki.debian.org/Multistrap"
 
 #. type: =head1
-#: pod/multistrap:197
+#: pod/multistrap:193
 msgid "Environment"
 msgstr "Ambiente"
 
 #. type: textblock
-#: pod/multistrap:199
+#: pod/multistrap:195
 msgid ""
 "To configure the unpacked packages (whether in native or cross mode), "
 "certain environment variables are needed:"
@@ -569,7 +538,7 @@ msgstr ""
 "são necessárias certas variáveis de ambiente:"
 
 #. type: textblock
-#: pod/multistrap:202
+#: pod/multistrap:198
 msgid ""
 "Debconf needs to be told to accept that user interaction is not desired:"
 msgstr ""
@@ -577,7 +546,7 @@ msgstr ""
 "utilizador não é desejada:"
 
 #. type: verbatim
-#: pod/multistrap:205
+#: pod/multistrap:201
 #, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
@@ -587,7 +556,7 @@ msgstr ""
 " \n"
 
 #. type: textblock
-#: pod/multistrap:207
+#: pod/multistrap:203
 msgid ""
 "Perl needs to be told to accept that no locales are available inside the "
 "chroot and not to complain:"
@@ -596,7 +565,7 @@ msgstr ""
 "dentro da chroot e não se queixar:"
 
 #. type: verbatim
-#: pod/multistrap:210
+#: pod/multistrap:206
 #, no-wrap
 msgid ""
 " LC_ALL=C LANGUAGE=C LANG=C\n"
@@ -606,17 +575,17 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:212
+#: pod/multistrap:208
 msgid "Then, dpkg can configure the packages:"
 msgstr "Depois, o dpkg pode configurar os pacotes."
 
 #. type: textblock
-#: pod/multistrap:214
+#: pod/multistrap:210
 msgid "chroot method (PATH = top directory of chroot):"
 msgstr "método de chroot (PATH = directório de topo da chroot):"
 
 #. type: verbatim
-#: pod/multistrap:216
+#: pod/multistrap:212
 #, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \\\n"
@@ -628,12 +597,12 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:219
+#: pod/multistrap:215
 msgid "at a login shell:"
 msgstr "numa shell de login:"
 
 #. type: verbatim
-#: pod/multistrap:221
+#: pod/multistrap:217
 #, no-wrap
 msgid ""
 " # export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
@@ -647,18 +616,18 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:225
+#: pod/multistrap:221
 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:227
+#: pod/multistrap:223
 msgid "Native mode - multistrap"
 msgstr "Modo nativo - multistrap"
 
 #. type: textblock
-#: pod/multistrap:229
+#: pod/multistrap:225
 #, fuzzy
 msgid ""
 "multistrap was not intended for native support, it was developed for cross "
@@ -671,7 +640,7 @@ msgstr ""
 "apt."
 
 #. type: textblock
-#: pod/multistrap:233
+#: pod/multistrap:229
 msgid ""
 "In native mode, various post-multistrap operations are likely to be needed "
 "that debootstrap would do for you:"
@@ -680,7 +649,7 @@ msgstr ""
 "multistrap que o debootstrap faria por si:"
 
 #. type: verbatim
-#: pod/multistrap:236
+#: pod/multistrap:232
 #, no-wrap
 msgid ""
 " 1. copy /etc/hosts into the chroot\n"
@@ -694,7 +663,7 @@ msgstr ""
 "\n"
 
 #. type: textblock
-#: pod/multistrap:240
+#: pod/multistrap:236
 msgid ""
 "(An alternative to unset the localisation variables is to add locales to "
 "your multistrap configuration file in the 'packages' option."
@@ -703,7 +672,7 @@ msgstr ""
 "seu ficheiro de configuração multistrap na opção 'packages')."
 
 #. type: textblock
-#: pod/multistrap:244
+#: pod/multistrap:240
 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."
@@ -712,13 +681,13 @@ msgstr ""
 "C<multistrap> corra C<dpkg --configure -a> no final do processo multistrap."
 
 #. type: =head1
-#: pod/multistrap:248
+#: pod/multistrap:244
 #, fuzzy
 msgid "Cascading configuration"
 msgstr "Configuração"
 
 #. type: textblock
-#: pod/multistrap:250
+#: pod/multistrap:246
 msgid ""
 "To support multiple variants of a basic (common) configuration, "
 "C<multistrap> allows configuration files to include other (more general)  "
@@ -728,12 +697,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:256
+#: pod/multistrap:252
 msgid "Base file:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:258
+#: pod/multistrap:254
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/crosschroot.conf\n"
@@ -741,12 +710,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:260
+#: pod/multistrap:256
 msgid "Variations:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:262
+#: pod/multistrap:258
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/armel.conf\n"
@@ -754,7 +723,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:264
+#: pod/multistrap:260
 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 "
@@ -762,7 +731,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:268
+#: pod/multistrap:264
 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 "
@@ -774,13 +743,13 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:276
+#: pod/multistrap:272
 #, fuzzy
 msgid "Machine:variant support"
 msgstr "Variantes de máquina"
 
 #. type: textblock
-#: pod/multistrap:278
+#: pod/multistrap:274
 msgid ""
 "The old packages.conf variables from emsandbox can all be converted into "
 "C<multistrap> configuration variables. The machine:variant support in "
@@ -788,7 +757,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:283
+#: pod/multistrap:279
 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 "
@@ -799,7 +768,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:291
+#: pod/multistrap:287
 msgid ""
 "One advantage of using machine:variant support is that the entire "
 "rootfilesystem can be managed by a single call to multistrap - this is "
@@ -807,14 +776,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:295
+#: pod/multistrap:291
 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:298
+#: pod/multistrap:294
 #, no-wrap
 msgid ""
 " [General]\n"
@@ -825,19 +794,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:304
+#: pod/multistrap:300
 msgid "Restricting package selection"
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:306
+#: pod/multistrap:302
 msgid ""
 "C<multistrap> includes Required packages by default, the current list of "
 "packages can be seen using:"
 msgstr ""
 
 #. type: verbatim
-#: pod/multistrap:309
+#: pod/multistrap:305
 #, no-wrap
 msgid ""
 " grep-available  -FPriority 'required' -sPackage\n"
@@ -845,7 +814,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:311
+#: pod/multistrap:307
 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 "
@@ -854,12 +823,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:317
+#: pod/multistrap:313
 msgid "Collecting packages from specific codenames/suites."
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:319
+#: pod/multistrap:315
 msgid ""
 "Packages specified explicitly in the configuration sections will be passed "
 "to apt as package/codename so that the configuration controls which version "
@@ -868,7 +837,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:324
+#: pod/multistrap:320
 msgid ""
 "When using this support in Lenny, ensure that each section uses the codename "
 "(etch, lenny, squeeze, sid) instead of the suite (oldstable, stable, "
@@ -877,12 +846,12 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: pod/multistrap:329
+#: pod/multistrap:325
 msgid "Recommends TOIMPLEMENT:"
 msgstr ""
 
 #. type: textblock
-#: pod/multistrap:331
+#: pod/multistrap:327
 msgid "Default recommends OFF option to set it as on."
 msgstr ""
 
@@ -930,6 +899,60 @@ msgid ""
 "fakeroot option to drop the internal fakeroot usage."
 msgstr ""
 
+#~ msgid "e.g. change"
+#~ msgstr "ex. change"
+
+#~ msgid ""
+#~ " debootstrap=Debian\n"
+#~ "\n"
+#~ msgstr ""
+#~ " debootstrap=Debian\n"
+#~ "\n"
+
+#~ msgid "to"
+#~ msgstr "para"
+
+#~ msgid ""
+#~ " debootstrap=Grip\n"
+#~ " \n"
+#~ msgstr ""
+#~ " debootstrap=Grip\n"
+#~ " \n"
+
+#~ msgid ""
+#~ "then add the new section for Grip:\n"
+#~ " \n"
+#~ msgstr ""
+#~ "depois adicione a nova secção para o Grip:\n"
+#~ " \n"
+
+#~ msgid ""
+#~ " [Grip]\n"
+#~ " packages=locales\n"
+#~ " keyring=emdebian-archive-keyring\n"
+#~ " source=http://www.emdebian.org/grip\n"
+#~ " suite=lenny\n"
+#~ "\n"
+#~ msgstr ""
+#~ " [Grip]\n"
+#~ " packages=locales\n"
+#~ " keyring=emdebian-archive-keyring\n"
+#~ " source=http://www.emdebian.org/grip\n"
+#~ " suite=lenny\n"
+#~ "\n"
+
+#~ 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 "
+#~ "dependencies in Debian 5.0 Lenny, allowing you to add any package(s) you "
+#~ "need from Debian that are not yet in Emdebian Grip."
+#~ msgstr ""
+#~ "Definir Grip em vez de Debian na opção do debootstrap, como em cima, irá "
+#~ "disponibilizar um sistema base a partir de Emdebian Grip 1.0 e localizar "
+#~ "quaisquer dependências em falta em Debian 5.0 Lenny, permitindo-lhe "
+#~ "adicionar quaisquer pacote(s) que precise de Debian e que não estão ainda "
+#~ "em Emdebian Grip."
+
 #, fuzzy
 #~| msgid ""
 #~| "em_multistrap does not currently implement the machine:variant support "