Add support for omitdebsrc and change suite behaviour to be non- default, usable by selecting explicitsuite to true.

git-svn-id: http://emdebian.org/svn/current@7235 563faec7-e20c-0410-992a-a66f704d0ccd
2010-05-27 15:14:05 +00:00 · 2010-05-27 15:14:05 +00:00 · 8d1160c337
commit 8d1160c337
parent 149f09e1ab
9 changed files with 1482 additions and 569 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -7,8 +7,10 @@ multistrap (2.1.5) unstable; urgency=low
  * [INTL:pt] Updated Portuguese translation for manpage messages
    (Closes: #581673)
  * [INTL:fr] French program output translation (Closes: #582059)
  * Add support for omitdebsrc and change suite behaviour to be non-
    default, usable by selecting explicitsuite to true.
- -- Neil Williams <codehelp@debian.org>  Tue, 18 May 2010 08:50:11 +0100
+ -- Neil Williams <codehelp@debian.org>  Thu, 27 May 2010 16:12:25 +0100
 multistrap (2.1.4) unstable; urgency=low
--- 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-13 19:23+0200\n"
+"POT-Creation-Date: 2010-05-27 16:13+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"
@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-Bookmarks: 138,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 #. type: =head1
-#: pod/multistrap:3 device-table.pl:136
+#: pod/multistrap:3 device-table.pl:138
 msgid "Name"
 msgstr "Nom"
@ -29,7 +29,7 @@ msgstr ""
 "em_multistrap - Ajoute à debootstrap la capacité de gérer plusieurs dépôts"
 #. type: =head1
-#: pod/multistrap:7 device-table.pl:140
+#: pod/multistrap:7 device-table.pl:142
 msgid "Synopsis"
 msgstr "Synopsis"
@ -47,7 +47,7 @@ msgstr ""
 "\n"
 #. type: =head1
-#: pod/multistrap:13 device-table.pl:145
+#: pod/multistrap:13 device-table.pl:147
 msgid "Options"
 msgstr "Options"
@ -65,7 +65,6 @@ msgstr ""
 #. type: textblock
 #: 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 ""
 "(Ces options peuvent également être définies dans le fichier de "
@ -118,9 +117,6 @@ msgstr ""
 #. type: textblock
 #: 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 bootstrap / root filesystem with all "
 "packages installed and configured, instead of just the base system."
@ -136,27 +132,6 @@ msgstr "Exemple de configuration :"
 #. type: verbatim
 #: pod/multistrap:46
 #, fuzzy, no-wrap
 #| msgid ""
 #| " [General]\n"
 #| " arch=armel\n"
 #| " directory=/opt/multistrap/\n"
 #| " # same as --tidy-up option if set to true\n"
 #| " cleanup=true\n"
 #| " # same as --no-auth option if set to true\n"
 #| " # keyring packages listed in each debootstrap will\n"
 #| " # still be installed.\n"
 #| " noauth=false\n"
 #| " # extract all downloaded archives (default is true)\n"
 #| " unpack=true\n"
 #| " # aptsources is a list of sections to be used for downloading packages\n"
 #| " # and lists and placed in 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 debootstrap option determines which repository\n"
 #| " # is used to calculate the list of Priority: required packages.\n"
 #| " debootstrap=Debian\n"
 #| " \n"
 msgid ""
 " [General]\n"
 " arch=armel\n"
@ -169,8 +144,11 @@ msgid ""
 " noauth=false\n"
 " # extract all downloaded archives (default is true)\n"
 " unpack=true\n"
 " # whether to add the /suite to be explicit about where apt\n"
 " # needs to look for packages. Default is false.\n"
 " explicitsuite=false\n"
 " # aptsources is a list of sections to be used\n"
-" # the /etc/apt/sources.list.d/multistrap.sources.list      \n"
+" # the /etc/apt/sources.list.d/multistrap.sources.list\n"
 " # of the target. Order is not important\n"
 " aptsources=Debian\n"
 " # the bootstrap option determines which repository\n"
@ -202,7 +180,7 @@ msgstr ""
 " \n"
 #. type: verbatim
-#: pod/multistrap:67
+#: pod/multistrap:70 pod/multistrap:154
 #, no-wrap
 msgid ""
 " [Debian]\n"
@ -220,7 +198,7 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:73
+#: pod/multistrap:76
 msgid ""
 "This will result in a completely normal debootstrap of Debian lenny from the "
 "specified mirror, for armel in '/opt/multistrap/'."
@ -229,7 +207,7 @@ msgstr ""
 "partir du miroir spécifié, pour armel dans « /opt/multistrap/ »."
 #. type: textblock
-#: pod/multistrap:76
+#: pod/multistrap:79
 msgid ""
 "Specify a package to extend the multistrap to include that package and all "
 "dependencies."
@ -238,11 +216,8 @@ msgstr ""
 "toutes ses dépendances."
 #. type: textblock
-#: pod/multistrap:79
+#: pod/multistrap:82
 #, fuzzy
 #| msgid ""
 #| "Specify more debootstraps by adding new sections. Section names are used "
 #| "in the debootstrap general option."
 msgid ""
 "Specify more bootstraps by adding new sections. Section names are used in "
 "the bootstrap general option."
@ -251,19 +226,13 @@ msgstr ""
 "de sections sont utilisés dans l'option générale de debootstrap."
 #. type: textblock
-#: pod/multistrap:82
+#: pod/multistrap:85
 msgid "Section names are case-insensitive."
 msgstr "La casse des lettres n'est pas importante dans les noms de section."
 #. type: textblock
-#: pod/multistrap:84
+#: pod/multistrap:87
 #, 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 "
@ -279,12 +248,8 @@ msgstr ""
 "paquets."
 #. type: textblock
-#: pod/multistrap:91
+#: pod/multistrap:94
 #, fuzzy
 #| msgid ""
 #| "'Architecture' and 'directory' can be overridden on the command line.  "
 #| "Other general options have command line options, except debootstrap "
 #| "itself."
 msgid ""
 "'Architecture' and 'directory' can be overridden on the command line.  Some "
 "other general options also have command line options."
@ -294,12 +259,12 @@ msgstr ""
 "sauf debootstrap."
 #. type: =head1
-#: pod/multistrap:94
+#: pod/multistrap:97
 msgid "Repositories"
 msgstr ""
 #. type: textblock
-#: pod/multistrap:96
+#: pod/multistrap:99
 msgid ""
 "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 "
@ -309,7 +274,7 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:102
+#: pod/multistrap:105
 msgid ""
 "C<bootstrap> lists the sections which will be used to create the multistrap "
 "itself. Only packages listed in C<bootstrap> will be downloaded and unpacked "
@ -317,14 +282,14 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:106
+#: pod/multistrap:109
 msgid ""
 "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 ""
 #. type: textblock
-#: pod/multistrap:109
+#: pod/multistrap:112
 msgid ""
 "(Older versions of multistrap supported the same option under the "
 "C<debootstrap> name - this spelling is still supported but new configuration "
@ -332,16 +297,19 @@ msgid ""
 msgstr ""
 #. type: =head1
-#: pod/multistrap:113
+#: pod/multistrap:116
 msgid "General settings:"
 msgstr "Paramètres généraux :"
 #. type: textblock
-#: pod/multistrap:115
+#: pod/multistrap:118
 msgid ""
 "'arch' can be overridden on the command line using the C<--arch> option."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:120
 #, fuzzy
 #| msgid ""
 #| "'directory' specifies the top level directory where the debootstrap will "
 #| "be created - it is not packed into a .tgz once complete."
 msgid ""
 "'directory' specifies the top level directory where the bootstrap will be "
 "created - it is not packed into a .tgz once complete."
@ -350,7 +318,35 @@ msgstr ""
 "sera créé - il n'est pas empaqueté en un .tgz une fois complété."
 #. type: textblock
-#: pod/multistrap:118
+#: pod/multistrap:123
 msgid ""
 "'bootstrap' lists the Sections which will be used to specify the packages "
 "which will be downloaded (and optionally unpacked) into the bootstrap."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:126
 msgid ""
 "'aptsources' lists the Sections which will be used to specify the apt "
 "sources in the final system, e.g. if you need to use a local repository to "
 "generate the rootfs which will not be available to the device at runtime, "
 "list that section in C<bootstrap> but not in C<aptsources>."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:131
 msgid ""
 "If you want a package to be in the rootfs, it B<must> be specified in the "
 "C<bootstrap> list under General."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:134
 msgid "The order of section names in either list is not important."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:136
 #, fuzzy
 msgid ""
 "As with debootstrap, multistrap will continue after errors, as long as the "
@ -358,7 +354,7 @@ msgid ""
 msgstr "Comme pour debootstrap, em_multistrap se poursuivra après des erreurs."
 #. type: textblock
-#: pod/multistrap:121
+#: pod/multistrap:139
 msgid ""
 "multistrap also implements the machine:variant support originally used in "
 "Emdebian Crush, although in a different implementation. Using the cascading "
@ -367,14 +363,14 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:126
+#: pod/multistrap:144
 msgid ""
 "Setting C<tarballname> to true also packs up the final filesystem into a "
 "tarball."
 msgstr ""
 #. type: textblock
-#: pod/multistrap:129
+#: pod/multistrap:147
 msgid ""
 "Note that multistrap ignores any unrecognised options in the config file - "
 "this allows for backwards-compatible behaviour as well as overloading the "
@ -382,12 +378,64 @@ msgid ""
 msgstr ""
 #. type: =head1
-#: pod/multistrap:134
+#: pod/multistrap:152
 #, fuzzy
 msgid "Section settings"
 msgstr "Paramètres généraux :"
 #. type: textblock
 #: pod/multistrap:160
 msgid ""
 "The section name (in [] brackets) needs to be unique for this configuration "
 "file and any configuration files which this file includes. Section names are "
 "case insensitive (all comparisons happen after conversion to lower case)."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:165
 msgid ""
 "'packages' is the list of packages to be added when this Section is listed "
 "in C<bootstrap>."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:168
 msgid ""
 "'source' is the apt source to use for this Section. (To use a local source "
 "on the same machine, ensure you use C<copy://> not C<file://>, so that apt "
 "is told to copy the packages into the rootfs instead of assuming it can try "
 "to download them later - because that \"later\" will never actually happen."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:174
 msgid ""
 "'keyring' lists the package which contains the key used by the source listed "
 "in this Section. If no keyring is specified, the C<noauth> option must be "
 "set to B<true>. See Secure Apt."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:178
 msgid ""
 "'suite' is the suite to use from this source. Note that this B<must> be the "
 "suite, not the codename."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:181
 msgid ""
 "Suites change from time to time: (oldstable, stable, testing, sid)  The "
 "codename (etch, lenny, squeeze, sid) does not change."
 msgstr ""
 #. type: =head1
 #: pod/multistrap:185
 msgid "Secure Apt"
 msgstr "Apt sécurisé"
 #. type: textblock
-#: pod/multistrap:136
+#: pod/multistrap:187
 msgid ""
 "To use authenticated apt repositories, multistrap either needs to be able to "
 "install an appropriate keyring package from the existing apt sources "
@ -400,7 +448,7 @@ msgstr ""
 "en utilisant apt-key *sur le système hôte*."
 #. type: textblock
-#: pod/multistrap:141
+#: pod/multistrap:192
 #, fuzzy
 msgid ""
 "If relevant packages exist, specify them in the 'keyring' option for each "
@ -413,7 +461,7 @@ msgstr ""
 "ainsi le dépôt pourra être authentifié avant de télécharger des paquets."
 #. type: textblock
-#: pod/multistrap:146
+#: pod/multistrap:197
 msgid ""
 "Note that *all* repositories to be used with multistrap must be "
 "authenticated or apt will fail. Similarly, secure apt can only be disabled "
@ -431,7 +479,7 @@ msgstr ""
 "de clés, si vous configurez apt-key correctement."
 #. type: textblock
-#: pod/multistrap:154
+#: pod/multistrap:205
 msgid ""
 "The keyring package(s) will also be installed inside the multistrap "
 "environment to match the installed apt sources for the multistrap."
@ -441,7 +489,7 @@ msgstr ""
 "installés du multistrap."
 #. type: textblock
-#: pod/multistrap:157
+#: pod/multistrap:208
 msgid ""
 "All configuration of apt-key needs to be done for the machine running "
 "multistrap itself."
@ -450,12 +498,12 @@ msgstr ""
 "multistrap."
 #. type: =head1
-#: pod/multistrap:160
+#: pod/multistrap:211
 msgid "State"
 msgstr "État"
 #. type: textblock
-#: pod/multistrap:162
+#: pod/multistrap:213
 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."
@ -465,12 +513,12 @@ msgstr ""
 "s'était arrêté."
 #. type: =head1
-#: pod/multistrap:165
+#: pod/multistrap:216
 msgid "Configuration"
 msgstr "Configuration"
 #. type: textblock
-#: pod/multistrap:167
+#: pod/multistrap:218
 msgid ""
 "multistrap unpacks the downloaded packages but other stages of system "
 "configuration are not attempted. Examples include:"
@ -479,7 +527,7 @@ msgstr ""
 "configuration du système ne sont pas tentées. Les exemples incluent : "
 #. type: verbatim
-#: pod/multistrap:170
+#: pod/multistrap:221
 #, no-wrap
 msgid ""
 " /etc/inittab\n"
@ -505,7 +553,7 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:180
+#: pod/multistrap:231
 msgid ""
 "Any device-specific device nodes will also need to be created using MAKEDEV."
 msgstr ""
@ -513,7 +561,7 @@ msgstr ""
 "utilisant MAKEDEV."
 #. type: textblock
-#: pod/multistrap:183
+#: pod/multistrap:234
 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 "
@ -521,7 +569,7 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:188
+#: pod/multistrap:239
 msgid ""
 "Once multistrap has successfully created the basic file and directory "
 "layout, other device-specific scripts are needed before the filesystem can "
@ -533,7 +581,7 @@ msgstr ""
 "le périphérique cible."
 #. type: textblock
-#: pod/multistrap:193
+#: pod/multistrap:244
 msgid ""
 "Once installed, the packages themselves need to be configured using the "
 "package maintainer scripts and C<dpkg --configure -a>, unless this is a "
@ -544,7 +592,7 @@ msgstr ""
 "moins qu'il ne s'agisse d'un multistrap natif."
 #. type: textblock
-#: pod/multistrap:197
+#: pod/multistrap:248
 msgid ""
 "For C<dpkg> to work, F</proc> and F</sysfs> must be mounted (or mountable), "
 "F</dev/pts> is also recommended."
@ -553,17 +601,17 @@ msgstr ""
 "montés (ou être montables), F</dev/pts> est également recommandé."
 #. type: textblock
-#: pod/multistrap:200
+#: pod/multistrap:251
 msgid "See also: http://wiki.debian.org/Multistrap"
 msgstr "Voir aussi : http://wiki.debian.org/Multistrap"
 #. type: =head1
-#: pod/multistrap:202
+#: pod/multistrap:253
 msgid "Environment"
 msgstr "Environnement"
 #. type: textblock
-#: pod/multistrap:204
+#: pod/multistrap:255
 msgid ""
 "To configure the unpacked packages (whether in native or cross mode), "
 "certain environment variables are needed:"
@ -572,7 +620,7 @@ msgstr ""
 "natif), certaines variables d'environnements sont nécessaires :"
 #. type: textblock
-#: pod/multistrap:207
+#: pod/multistrap:258
 msgid ""
 "Debconf needs to be told to accept that user interaction is not desired:"
 msgstr ""
@ -580,17 +628,17 @@ msgstr ""
 "pas souhaitée : "
 #. type: verbatim
-#: pod/multistrap:210
+#: pod/multistrap:261
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
-" \n"
+"\n"
 msgstr ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
 " \n"
 #. type: textblock
-#: pod/multistrap:212
+#: pod/multistrap:263
 msgid ""
 "Perl needs to be told to accept that no locales are available inside the "
 "chroot and not to complain:"
@ -599,7 +647,7 @@ msgstr ""
 "l'intérieur du chroot et de ne pas se plaindre :"
 #. type: verbatim
-#: pod/multistrap:215
+#: pod/multistrap:266
 #, no-wrap
 msgid ""
 " LC_ALL=C LANGUAGE=C LANG=C\n"
@ -609,17 +657,17 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:217
+#: pod/multistrap:268
 msgid "Then, dpkg can configure the packages:"
 msgstr "Puis, dpkg peut configurer les paquets :"
 #. type: textblock
-#: pod/multistrap:219
+#: pod/multistrap:270
 msgid "chroot method (PATH = top directory of chroot):"
 msgstr "méthode chroot (PATH = le répertoire de base du chroot) :"
 #. type: verbatim
-#: pod/multistrap:221
+#: pod/multistrap:272
 #, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \\\n"
@ -631,12 +679,12 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:224
+#: pod/multistrap:275
 msgid "at a login shell:"
 msgstr "dans un interpréteur de commandes de connexion : "
 #. type: verbatim
-#: pod/multistrap:226
+#: pod/multistrap:277
 #, no-wrap
 msgid ""
 " # export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
@ -650,19 +698,19 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:230
+#: pod/multistrap:281
 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:232
+#: pod/multistrap:283
 msgid "Native mode - multistrap"
 msgstr "mode natif - multistrap"
 #. type: textblock
-#: pod/multistrap:234
+#: pod/multistrap:285
 #, fuzzy
 msgid ""
 "multistrap was not intended for native support, it was developed for cross "
@ -675,7 +723,7 @@ msgstr ""
 "par apt."
 #. type: textblock
-#: pod/multistrap:238
+#: pod/multistrap:289
 msgid ""
 "In native mode, various post-multistrap operations are likely to be needed "
 "that debootstrap would do for you:"
@ -684,7 +732,7 @@ msgstr ""
 "pour vous sont probablement nécessaires :"
 #. type: verbatim
-#: pod/multistrap:241
+#: pod/multistrap:292
 #, no-wrap
 msgid ""
 " 1. copy /etc/hosts into the chroot\n"
@ -698,7 +746,7 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:245
+#: pod/multistrap:296
 msgid ""
 "(An alternative to unset the localisation variables is to add locales to "
 "your multistrap configuration file in the 'packages' option."
@ -708,7 +756,7 @@ msgstr ""
 "»."
 #. type: textblock
-#: pod/multistrap:249
+#: pod/multistrap:300
 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."
@ -718,13 +766,13 @@ msgstr ""
 "multistrap."
 #. type: =head1
-#: pod/multistrap:253
+#: pod/multistrap:304
 #, fuzzy
 msgid "Cascading configuration"
 msgstr "Configuration"
 #. type: textblock
-#: pod/multistrap:255
+#: pod/multistrap:306
 msgid ""
 "To support multiple variants of a basic (common) configuration, "
 "C<multistrap> allows configuration files to include other (more general)  "
@ -734,12 +782,12 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:261
+#: pod/multistrap:312
 msgid "Base file:"
 msgstr ""
 #. type: verbatim
-#: pod/multistrap:263
+#: pod/multistrap:314
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/crosschroot.conf\n"
@ -747,12 +795,12 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:265
+#: pod/multistrap:316
 msgid "Variations:"
 msgstr ""
 #. type: verbatim
-#: pod/multistrap:267
+#: pod/multistrap:318
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/armel.conf\n"
@ -760,7 +808,7 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:269
+#: pod/multistrap:320
 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 "
@ -768,7 +816,7 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:273
+#: pod/multistrap:324
 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 "
@ -780,13 +828,13 @@ msgid ""
 msgstr ""
 #. type: =head1
-#: pod/multistrap:281
+#: pod/multistrap:332
 #, fuzzy
 msgid "Machine:variant support"
 msgstr "Variantes de Machines"
 #. type: textblock
-#: pod/multistrap:283
+#: pod/multistrap:334
 msgid ""
 "The old packages.conf variables from emsandbox can all be converted into "
 "C<multistrap> configuration variables. The machine:variant support in "
@ -794,7 +842,7 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:288
+#: pod/multistrap:339
 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 "
@ -805,7 +853,7 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:295
+#: pod/multistrap:346
 msgid ""
 "One advantage of using machine:variant support is that the entire "
 "rootfilesystem can be managed by a single call to multistrap - this is "
@ -813,14 +861,14 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:299
+#: pod/multistrap:350
 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:302
+#: pod/multistrap:353
 #, no-wrap
 msgid ""
 " [General]\n"
@ -831,19 +879,19 @@ msgid ""
 msgstr ""
 #. type: =head1
-#: pod/multistrap:308
+#: pod/multistrap:359
 msgid "Restricting package selection"
 msgstr ""
 #. type: textblock
-#: pod/multistrap:310
+#: pod/multistrap:361
 msgid ""
 "C<multistrap> includes Required packages by default, the current list of "
 "packages can be seen using:"
 msgstr ""
 #. type: verbatim
-#: pod/multistrap:313
+#: pod/multistrap:364
 #, no-wrap
 msgid ""
 " grep-available  -FPriority 'required' -sPackage\n"
@ -851,7 +899,7 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:315
+#: pod/multistrap:366
 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 "
@ -860,21 +908,75 @@ msgid ""
 msgstr ""
 #. type: =head1
-#: pod/multistrap:321
+#: pod/multistrap:372
-msgid "Collecting packages from specific codenames/suites."
+msgid "Recommends behaviour"
 msgstr ""
 #. type: textblock
-#: pod/multistrap:323
+#: pod/multistrap:374
 msgid ""
-"Packages specified explicitly in the configuration sections will be passed "
+"The Debian default behaviour after the Lenny release was to consider "
-"to apt as package/codename so that the configuration controls which version "
+"recommended packages as extra packages to be installed when any one package "
-"of a package is installed should the package exist in two sources with "
+"is selected. Recommended packages are those which the maintainer considers "
-"different suites."
+"that would be present on C<most> installations of that package and allowing "
 "Recommends means allowing Recommends of recommended packages and so on."
 msgstr ""
 #. type: textblock
-#: pod/multistrap:328
+#: pod/multistrap:381
 msgid "The multistrap default is to turn recommends OFF."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:383
 msgid ""
 "Set the allowrecommends option to true in the General section to use typical "
 "Debian behaviour."
 msgstr ""
 #. type: =head1
 #: pod/multistrap:386
 msgid "Explicit suite specification"
 msgstr ""
 #. type: textblock
 #: pod/multistrap:388
 msgid ""
 "Sometimes, apt needs to be told to get a particular package from a "
 "particular suite, ignoring a more recent version in another suite in the "
 "same set of sources."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:392
 msgid ""
 "C<multistrap> can operate with and without the explicit suite option, the "
 "default is to let apt use the most recent version from the collection of "
 "specified F<bootstrap> sources."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:396
 msgid ""
 "Explicit suite specification has no effect on the final installed system - "
 "if your aptsources includes a repository which in turn includes a newer "
 "version of the package(s) specified explicitly, the next C<apt-get upgrade> "
 "on the device will bring in the newer version."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:401
 msgid ""
 "Also, when specifying packages to get from a specific suite, apt will also "
 "try and ensure that the dependencies for that package are also from the same "
 "suite and this can cause apt to be unable to resolve the complete set of "
 "dependencies. In this situation, being explicit about one package selection "
 "may require being explicit about some (not necessarily all) of the "
 "dependencies of that package as well."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:408
 msgid ""
 "When using this support in Lenny, ensure that each section uses the suite "
 "(oldstable, stable, testing, sid) and B<not> the codename (etch, lenny, "
@ -883,12 +985,12 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:333
+#: pod/multistrap:413
 msgid "To test, on Lenny, try:"
 msgstr ""
 #. type: verbatim
-#: pod/multistrap:335
+#: pod/multistrap:415
 #, no-wrap
 msgid ""
 " $ sudo apt-get install apt/stable\n"
@ -896,12 +998,12 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:337
+#: pod/multistrap:417
 msgid "Compare with"
 msgstr ""
 #. type: verbatim
-#: pod/multistrap:339
+#: pod/multistrap:419
 #, no-wrap
 msgid ""
 " $ sudo apt-get install apt/lenny\n"
@ -909,22 +1011,51 @@ msgid ""
 msgstr ""
 #. type: =head1
-#: pod/multistrap:341
+#: pod/multistrap:423
-msgid "Recommends TOIMPLEMENT:"
+msgid "Omitting deb-src listings"
 msgstr ""
 #. type: textblock
-#: pod/multistrap:343
+#: pod/multistrap:425
-msgid "Default recommends OFF option to set it as on."
+msgid ""
 "Some multistrap environments do not need access to the Debian sources of "
 "packages being installed, typically this is required when preparing a build "
 "(or cross-build) chroot using multistrap."
 msgstr ""
 #. type: textblock
-#: device-table.pl:138
+#: pod/multistrap:429
 msgid ""
 "To turn off this additional source (and save both download time and apt-"
 "cache size), use the omitdebsrc field in each Section."
 msgstr ""
 #. type: verbatim
 #: pod/multistrap:432
 #, fuzzy, no-wrap
 msgid ""
 " [Baked]\n"
 " packages=\n"
 " source=http://www.emdebian.org/baked\n"
 " keyring=emdebian-archive-keyring\n"
 " suite=testing\n"
 " omitdebsrc=true\n"
 "\n"
 msgstr ""
 "[Debian]\n"
 " packages=\n"
 " source=http://ftp.uk.debian.org/debian\n"
 " keyring=debian-archive-keyring\n"
 " suite=lenny\n"
 "\n"
 #. type: textblock
 #: device-table.pl:140
 msgid "device-table.pl - parses simple device tables and passes to mknod"
 msgstr ""
 #. type: verbatim
-#: device-table.pl:142
+#: device-table.pl:144
 #, fuzzy, no-wrap
 msgid ""
 " device-table.pl [-d DIR] [-f FILE]\n"
@ -936,26 +1067,26 @@ msgstr ""
 "\n"
 #. type: textblock
-#: device-table.pl:147
+#: device-table.pl:149
 msgid ""
 "By default, device-table.pl writes out the device nodes in the current "
 "working directory. Use the directory option to write out elsewhere."
 msgstr ""
 #. type: textblock
-#: device-table.pl:150
+#: device-table.pl:152
 msgid ""
 "multistrap contains a default device-table file, use the file option to "
 "override the default /usr/share/multistrap/device-table.txt"
 msgstr ""
 #. type: textblock
-#: device-table.pl:153
+#: device-table.pl:155
 msgid "Use the dry-run option to see the commands that would be run."
 msgstr ""
 #. type: textblock
-#: device-table.pl:155
+#: device-table.pl:157
 msgid ""
 "Device nodes needs fakeroot or another way to use root access. If device-"
 "table.pl is already being run under fakeroot or equivalent, use the no-"
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: multistrap 2.1.4\n"
-"POT-Creation-Date: 2010-05-15 09:06+0200\n"
+"POT-Creation-Date: 2010-05-27 16:13+0200\n"
 "PO-Revision-Date: 2010-05-14 20:52+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #. type: =head1
-#: pod/multistrap:3 device-table.pl:136
+#: pod/multistrap:3 device-table.pl:138
 msgid "Name"
 msgstr "Nome"
@ -28,7 +28,7 @@ msgstr ""
 "multistrap - substituto do debootstrap para suporte a múltiplos repositórios"
 #. type: =head1
-#: pod/multistrap:7 device-table.pl:140
+#: pod/multistrap:7 device-table.pl:142
 msgid "Synopsis"
 msgstr "Sinopse"
@ -47,7 +47,7 @@ msgstr ""
 "\n"
 #. type: =head1
-#: pod/multistrap:13 device-table.pl:145
+#: pod/multistrap:13 device-table.pl:147
 msgid "Options"
 msgstr "Opções"
@ -106,11 +106,6 @@ msgstr "Descrição"
 #. type: textblock
 #: pod/multistrap:35
 #, fuzzy
 #| msgid ""
 #| "multistrap provides a debootstrap-like method based on apt and extended "
 #| "to provide support for multiple repositories, using a configuration file "
 #| "to specify the relevant suites, architecture, extra packages and the "
 #| "mirror to use for each debootstrap."
 msgid ""
 "multistrap provides a debootstrap-like method based on apt and extended to "
 "provide support for multiple repositories, using a configuration file to "
@ -138,7 +133,7 @@ msgstr "Exemplo de configuração:"
 #. type: verbatim
 #: pod/multistrap:46
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
 " [General]\n"
 " arch=armel\n"
@ -151,8 +146,11 @@ msgid ""
 " noauth=false\n"
 " # extract all downloaded archives (default is true)\n"
 " unpack=true\n"
 " # whether to add the /suite to be explicit about where apt\n"
 " # needs to look for packages. Default is false.\n"
 " explicitsuite=false\n"
 " # aptsources is a list of sections to be used\n"
-" # the /etc/apt/sources.list.d/multistrap.sources.list      \n"
+" # the /etc/apt/sources.list.d/multistrap.sources.list\n"
 " # of the target. Order is not important\n"
 " aptsources=Debian\n"
 " # the bootstrap option determines which repository\n"
@ -185,7 +183,7 @@ msgstr ""
 " \n"
 #. type: verbatim
-#: pod/multistrap:67
+#: pod/multistrap:70 pod/multistrap:154
 #, no-wrap
 msgid ""
 " [Debian]\n"
@ -203,7 +201,7 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:73
+#: pod/multistrap:76
 msgid ""
 "This will result in a completely normal debootstrap of Debian lenny from the "
 "specified mirror, for armel in '/opt/multistrap/'."
@ -212,7 +210,7 @@ msgstr ""
 "partir do mirror especificado, para armel em '/opt/multistrap/'."
 #. type: textblock
-#: pod/multistrap:76
+#: pod/multistrap:79
 msgid ""
 "Specify a package to extend the multistrap to include that package and all "
 "dependencies."
@ -221,7 +219,7 @@ msgstr ""
 "todas as dependências."
 #. type: textblock
-#: pod/multistrap:79
+#: pod/multistrap:82
 msgid ""
 "Specify more bootstraps by adding new sections. Section names are used in "
 "the bootstrap general option."
@ -230,12 +228,12 @@ msgstr ""
 "são usados na opção geral do bootstrap."
 #. type: textblock
-#: pod/multistrap:82
+#: pod/multistrap:85
 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:84
+#: pod/multistrap:87
 msgid ""
 "All dependencies are resolved only by apt, using all bootstrap repositories, "
 "to use only the most recent and most suitable dependencies. Note that "
@ -251,12 +249,8 @@ msgstr ""
 "explicitamente na linha de pacotes."
 #. type: textblock
-#: pod/multistrap:91
+#: pod/multistrap:94
 #, fuzzy
 #| msgid ""
 #| "'Architecture' and 'directory' can be overridden on the command line.  "
 #| "Other general options have command line options, except debootstrap "
 #| "itself."
 msgid ""
 "'Architecture' and 'directory' can be overridden on the command line.  Some "
 "other general options also have command line options."
@ -266,12 +260,12 @@ msgstr ""
 "debootstrap."
 #. type: =head1
-#: pod/multistrap:94
+#: pod/multistrap:97
 msgid "Repositories"
 msgstr ""
 #. type: textblock
-#: pod/multistrap:96
+#: pod/multistrap:99
 msgid ""
 "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 "
@ -286,7 +280,7 @@ msgstr ""
 "ficheiros raiz instalado."
 #. type: textblock
-#: pod/multistrap:102
+#: pod/multistrap:105
 msgid ""
 "C<bootstrap> lists the sections which will be used to create the multistrap "
 "itself. Only packages listed in C<bootstrap> will be downloaded and unpacked "
@ -297,7 +291,7 @@ msgstr ""
 "desempacotados pelo multistrap."
 #. type: textblock
-#: pod/multistrap:106
+#: pod/multistrap:109
 msgid ""
 "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."
@ -306,7 +300,7 @@ msgstr ""
 "capaz de encontrar todos os pacotes a serem desempacotados para o multistrap."
 #. type: textblock
-#: pod/multistrap:109
+#: pod/multistrap:112
 msgid ""
 "(Older versions of multistrap supported the same option under the "
 "C<debootstrap> name - this spelling is still supported but new configuration "
@ -314,16 +308,19 @@ msgid ""
 msgstr ""
 #. type: =head1
-#: pod/multistrap:113
+#: pod/multistrap:116
 msgid "General settings:"
 msgstr "Definições gerais:"
 #. type: textblock
-#: pod/multistrap:115
+#: pod/multistrap:118
 msgid ""
 "'arch' can be overridden on the command line using the C<--arch> option."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:120
 #, fuzzy
 #| msgid ""
 #| "'directory' specifies the top level directory where the debootstrap will "
 #| "be created - it is not packed into a .tgz once complete."
 msgid ""
 "'directory' specifies the top level directory where the bootstrap will be "
 "created - it is not packed into a .tgz once complete."
@ -332,9 +329,40 @@ msgstr ""
 "ser criado - não é empacotado em um .tgz depois de completo."
 #. type: textblock
-#: pod/multistrap:118
+#: pod/multistrap:123
 #, fuzzy
 msgid ""
 "'bootstrap' lists the Sections which will be used to specify the packages "
 "which will be downloaded (and optionally unpacked) into the bootstrap."
 msgstr ""
 "C<bootstrap> lista as secções que serão usadas para criar o próprio "
 "multistrap. Apenas os pacotes listados em C<bootstrap> serão descarregados e "
 "desempacotados pelo multistrap."
 #. type: textblock
 #: pod/multistrap:126
 msgid ""
 "'aptsources' lists the Sections which will be used to specify the apt "
 "sources in the final system, e.g. if you need to use a local repository to "
 "generate the rootfs which will not be available to the device at runtime, "
 "list that section in C<bootstrap> but not in C<aptsources>."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:131
 msgid ""
 "If you want a package to be in the rootfs, it B<must> be specified in the "
 "C<bootstrap> list under General."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:134
 msgid "The order of section names in either list is not important."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:136
 #, fuzzy
 #| msgid "As with debootstrap, multistrap will continue after errors."
 msgid ""
 "As with debootstrap, multistrap will continue after errors, as long as the "
 "configuration file can be correctly parsed."
@ -342,7 +370,7 @@ msgstr ""
 "Tal como no debootstrap, o multistrap irá continuar após ocorrerem erros."
 #. type: textblock
-#: pod/multistrap:121
+#: pod/multistrap:139
 msgid ""
 "multistrap also implements the machine:variant support originally used in "
 "Emdebian Crush, although in a different implementation. Using the cascading "
@ -356,7 +384,7 @@ msgstr ""
 "linha de comandos."
 #. type: textblock
-#: pod/multistrap:126
+#: pod/multistrap:144
 msgid ""
 "Setting C<tarballname> to true also packs up the final filesystem into a "
 "tarball."
@ -365,7 +393,7 @@ msgstr ""
 "ficheiros final num tarball."
 #. type: textblock
-#: pod/multistrap:129
+#: pod/multistrap:147
 msgid ""
 "Note that multistrap ignores any unrecognised options in the config file - "
 "this allows for backwards-compatible behaviour as well as overloading the "
@ -373,12 +401,64 @@ msgid ""
 msgstr ""
 #. type: =head1
-#: pod/multistrap:134
+#: pod/multistrap:152
 #, fuzzy
 msgid "Section settings"
 msgstr "Definições gerais:"
 #. type: textblock
 #: pod/multistrap:160
 msgid ""
 "The section name (in [] brackets) needs to be unique for this configuration "
 "file and any configuration files which this file includes. Section names are "
 "case insensitive (all comparisons happen after conversion to lower case)."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:165
 msgid ""
 "'packages' is the list of packages to be added when this Section is listed "
 "in C<bootstrap>."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:168
 msgid ""
 "'source' is the apt source to use for this Section. (To use a local source "
 "on the same machine, ensure you use C<copy://> not C<file://>, so that apt "
 "is told to copy the packages into the rootfs instead of assuming it can try "
 "to download them later - because that \"later\" will never actually happen."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:174
 msgid ""
 "'keyring' lists the package which contains the key used by the source listed "
 "in this Section. If no keyring is specified, the C<noauth> option must be "
 "set to B<true>. See Secure Apt."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:178
 msgid ""
 "'suite' is the suite to use from this source. Note that this B<must> be the "
 "suite, not the codename."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:181
 msgid ""
 "Suites change from time to time: (oldstable, stable, testing, sid)  The "
 "codename (etch, lenny, squeeze, sid) does not change."
 msgstr ""
 #. type: =head1
 #: pod/multistrap:185
 msgid "Secure Apt"
 msgstr "Segurança do Apt"
 #. type: textblock
-#: pod/multistrap:136
+#: pod/multistrap:187
 msgid ""
 "To use authenticated apt repositories, multistrap either needs to be able to "
 "install an appropriate keyring package from the existing apt sources "
@ -391,7 +471,7 @@ msgstr ""
 "configuradas usando apt-key *na máquina do sistema*."
 #. type: textblock
-#: pod/multistrap:141
+#: pod/multistrap:192
 msgid ""
 "If relevant packages exist, specify them in the 'keyring' option for each "
 "repository. multistrap will then check that apt has already installed this "
@ -404,7 +484,7 @@ msgstr ""
 "pacotes sejam descarregados dele."
 #. type: textblock
-#: pod/multistrap:146
+#: pod/multistrap:197
 msgid ""
 "Note that *all* repositories to be used with multistrap must be "
 "authenticated or apt will fail. Similarly, secure apt can only be disabled "
@ -422,7 +502,7 @@ msgstr ""
 "apt-key apropriadamente."
 #. type: textblock
-#: pod/multistrap:154
+#: pod/multistrap:205
 msgid ""
 "The keyring package(s) will also be installed inside the multistrap "
 "environment to match the installed apt sources for the multistrap."
@ -431,7 +511,7 @@ msgstr ""
 "multistrap para coincidir com as fontes apt instaladas para o multistrap."
 #. type: textblock
-#: pod/multistrap:157
+#: pod/multistrap:208
 msgid ""
 "All configuration of apt-key needs to be done for the machine running "
 "multistrap itself."
@ -440,12 +520,12 @@ msgstr ""
 "correndo o próprio multistrap."
 #. type: =head1
-#: pod/multistrap:160
+#: pod/multistrap:211
 msgid "State"
 msgstr "Estado"
 #. type: textblock
-#: pod/multistrap:162
+#: pod/multistrap:213
 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."
@ -454,12 +534,12 @@ msgstr ""
 "prosseguir como normalmente e o apt irá tentar prosseguir de onde ficou."
 #. type: =head1
-#: pod/multistrap:165
+#: pod/multistrap:216
 msgid "Configuration"
 msgstr "Configuração"
 #. type: textblock
-#: pod/multistrap:167
+#: pod/multistrap:218
 msgid ""
 "multistrap unpacks the downloaded packages but other stages of system "
 "configuration are not attempted. Examples include:"
@ -468,7 +548,7 @@ msgstr ""
 "outros estágios da configuração do sistema. Os exemplos incluem:"
 #. type: verbatim
-#: pod/multistrap:170
+#: pod/multistrap:221
 #, no-wrap
 msgid ""
 " /etc/inittab\n"
@ -494,7 +574,7 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:180
+#: pod/multistrap:231
 msgid ""
 "Any device-specific device nodes will also need to be created using MAKEDEV."
 msgstr ""
@ -502,7 +582,7 @@ msgstr ""
 "ser criados usando o MAKEDEV."
 #. type: textblock
-#: pod/multistrap:183
+#: pod/multistrap:234
 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 "
@ -514,7 +594,7 @@ msgstr ""
 "no pacote mtd-utils source."
 #. type: textblock
-#: pod/multistrap:188
+#: pod/multistrap:239
 msgid ""
 "Once multistrap has successfully created the basic file and directory "
 "layout, other device-specific scripts are needed before the filesystem can "
@ -526,7 +606,7 @@ msgstr ""
 "instalado no dispositivo de destino."
 #. type: textblock
-#: pod/multistrap:193
+#: pod/multistrap:244
 msgid ""
 "Once installed, the packages themselves need to be configured using the "
 "package maintainer scripts and C<dpkg --configure -a>, unless this is a "
@ -537,7 +617,7 @@ msgstr ""
 "seja um multistrap nativo."
 #. type: textblock
-#: pod/multistrap:197
+#: pod/multistrap:248
 msgid ""
 "For C<dpkg> to work, F</proc> and F</sysfs> must be mounted (or mountable), "
 "F</dev/pts> is also recommended."
@ -546,17 +626,17 @@ msgstr ""
 "(ou serem montáveis), também é recomendado F</dev/pts>."
 #. type: textblock
-#: pod/multistrap:200
+#: pod/multistrap:251
 msgid "See also: http://wiki.debian.org/Multistrap"
 msgstr "Veja também: http://wiki.debian.org/Multistrap"
 #. type: =head1
-#: pod/multistrap:202
+#: pod/multistrap:253
 msgid "Environment"
 msgstr "Ambiente"
 #. type: textblock
-#: pod/multistrap:204
+#: pod/multistrap:255
 msgid ""
 "To configure the unpacked packages (whether in native or cross mode), "
 "certain environment variables are needed:"
@ -565,7 +645,7 @@ msgstr ""
 "são necessárias certas variáveis de ambiente:"
 #. type: textblock
-#: pod/multistrap:207
+#: pod/multistrap:258
 msgid ""
 "Debconf needs to be told to accept that user interaction is not desired:"
 msgstr ""
@ -573,17 +653,17 @@ msgstr ""
 "utilizador não é desejada:"
 #. type: verbatim
-#: pod/multistrap:210
+#: pod/multistrap:261
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
-" \n"
+"\n"
 msgstr ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
 " \n"
 #. type: textblock
-#: pod/multistrap:212
+#: pod/multistrap:263
 msgid ""
 "Perl needs to be told to accept that no locales are available inside the "
 "chroot and not to complain:"
@ -592,7 +672,7 @@ msgstr ""
 "dentro da chroot e não se queixar:"
 #. type: verbatim
-#: pod/multistrap:215
+#: pod/multistrap:266
 #, no-wrap
 msgid ""
 " LC_ALL=C LANGUAGE=C LANG=C\n"
@ -602,17 +682,17 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:217
+#: pod/multistrap:268
 msgid "Then, dpkg can configure the packages:"
 msgstr "Depois, o dpkg pode configurar os pacotes."
 #. type: textblock
-#: pod/multistrap:219
+#: pod/multistrap:270
 msgid "chroot method (PATH = top directory of chroot):"
 msgstr "método de chroot (PATH = directório de topo da chroot):"
 #. type: verbatim
-#: pod/multistrap:221
+#: pod/multistrap:272
 #, no-wrap
 msgid ""
 " DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \\\n"
@ -624,12 +704,12 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:224
+#: pod/multistrap:275
 msgid "at a login shell:"
 msgstr "numa shell de login:"
 #. type: verbatim
-#: pod/multistrap:226
+#: pod/multistrap:277
 #, no-wrap
 msgid ""
 " # export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true\n"
@ -643,18 +723,18 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:230
+#: pod/multistrap:281
 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:232
+#: pod/multistrap:283
 msgid "Native mode - multistrap"
 msgstr "Modo nativo - multistrap"
 #. type: textblock
-#: pod/multistrap:234
+#: pod/multistrap:285
 msgid ""
 "multistrap was not intended for native support, it was developed for cross "
 "architecture support. In order for multiple repositories to be used, "
@ -666,7 +746,7 @@ msgstr ""
 "apt."
 #. type: textblock
-#: pod/multistrap:238
+#: pod/multistrap:289
 msgid ""
 "In native mode, various post-multistrap operations are likely to be needed "
 "that debootstrap would do for you:"
@ -675,7 +755,7 @@ msgstr ""
 "multistrap que o debootstrap faria por si:"
 #. type: verbatim
-#: pod/multistrap:241
+#: pod/multistrap:292
 #, no-wrap
 msgid ""
 " 1. copy /etc/hosts into the chroot\n"
@ -689,7 +769,7 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:245
+#: pod/multistrap:296
 msgid ""
 "(An alternative to unset the localisation variables is to add locales to "
 "your multistrap configuration file in the 'packages' option."
@ -698,7 +778,7 @@ msgstr ""
 "seu ficheiro de configuração multistrap na opção 'packages')."
 #. type: textblock
-#: pod/multistrap:249
+#: pod/multistrap:300
 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."
@ -707,12 +787,12 @@ msgstr ""
 "C<multistrap> corra C<dpkg --configure -a> no final do processo multistrap."
 #. type: =head1
-#: pod/multistrap:253
+#: pod/multistrap:304
 msgid "Cascading configuration"
 msgstr "Configuração em cascata"
 #. type: textblock
-#: pod/multistrap:255
+#: pod/multistrap:306
 msgid ""
 "To support multiple variants of a basic (common) configuration, "
 "C<multistrap> allows configuration files to include other (more general)  "
@ -727,12 +807,12 @@ msgstr ""
 "ficheiro inclui outro ficheiro que é partilhado por outras configurações."
 #. type: textblock
-#: pod/multistrap:261
+#: pod/multistrap:312
 msgid "Base file:"
 msgstr "Ficheiro base:"
 #. type: verbatim
-#: pod/multistrap:263
+#: pod/multistrap:314
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/crosschroot.conf\n"
@ -742,12 +822,12 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:265
+#: pod/multistrap:316
 msgid "Variations:"
 msgstr "Variações:"
 #. type: verbatim
-#: pod/multistrap:267
+#: pod/multistrap:318
 #, no-wrap
 msgid ""
 " /usr/share/multistrap/armel.conf\n"
@ -757,7 +837,7 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:269
+#: pod/multistrap:320
 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 "
@ -768,7 +848,7 @@ msgstr ""
 "único ficheiro."
 #. type: textblock
-#: pod/multistrap:273
+#: pod/multistrap:324
 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 "
@ -787,12 +867,12 @@ msgstr ""
 "portanto um simples erro de escrita pode resultar numa opção não definida."
 #. type: =head1
-#: pod/multistrap:281
+#: pod/multistrap:332
 msgid "Machine:variant support"
 msgstr "Suporte a Machine:variant"
 #. type: textblock
-#: pod/multistrap:283
+#: pod/multistrap:334
 msgid ""
 "The old packages.conf variables from emsandbox can all be converted into "
 "C<multistrap> configuration variables. The machine:variant support in "
@ -803,15 +883,8 @@ msgstr ""
 "C<multistrap> concentra-se nos scripts F<config.sh> e F<setup.sh>"
 #. type: textblock
-#: pod/multistrap:288
+#: pod/multistrap:339
 #, fuzzy
 #| msgid ""
 #| "Once C<multistrap> has unpacked the downloaded packages, the C<setup.sh> "
 #| "can be called, passing the location and architecture of the root "
 #| "filesystem, so that other fine tuning can take place. At this stage, any "
 #| "operations inside the rootfs must not try to execute any binaries within "
 #| "the rootfs. As the final stage of the multistrap process, C<config.sh> is "
 #| "copied into the F</machine/$MACHINE/default/> directory of the rootfs."
 msgid ""
 "Once C<multistrap> has unpacked the downloaded packages, the C<setup.sh> can "
 "be called, passing the location and architecture of the root filesystem, so "
@ -829,7 +902,7 @@ msgstr ""
 "rootfs."
 #. type: textblock
-#: pod/multistrap:295
+#: pod/multistrap:346
 msgid ""
 "One advantage of using machine:variant support is that the entire "
 "rootfilesystem can be managed by a single call to multistrap - this is "
@ -840,7 +913,7 @@ msgstr ""
 "útil quando se constrói sistemas de ficheiros raiz no espaço do utilizador."
 #. type: textblock
-#: pod/multistrap:299
+#: pod/multistrap:350
 msgid ""
 "To enable machine:variant support, specify the path to the scripts to be "
 "called in the variant configuration file (General section):"
@ -850,14 +923,8 @@ msgstr ""
 "General):"
 #. type: verbatim
-#: pod/multistrap:302
+#: pod/multistrap:353
 #, fuzzy, no-wrap
 #| msgid ""
 #| " [General]\n"
 #| " include=/path/to/general.conf\n"
 #| " setup_script=/path/to/setup.sh\n"
 #| " config_script=/path/to/config.sh\n"
 #| "\n"
 msgid ""
 " [General]\n"
 " include=/path/to/general.conf\n"
@ -872,12 +939,12 @@ msgstr ""
 "\n"
 #. type: =head1
-#: pod/multistrap:308
+#: pod/multistrap:359
 msgid "Restricting package selection"
 msgstr "Restringindo a selecção de pacotes"
 #. type: textblock
-#: pod/multistrap:310
+#: pod/multistrap:361
 msgid ""
 "C<multistrap> includes Required packages by default, the current list of "
 "packages can be seen using:"
@ -886,7 +953,7 @@ msgstr ""
 "lista actual de pacotes pode ser vista usando:"
 #. type: verbatim
-#: pod/multistrap:313
+#: pod/multistrap:364
 #, no-wrap
 msgid ""
 " grep-available  -FPriority 'required' -sPackage\n"
@ -896,7 +963,7 @@ msgstr ""
 "\n"
 #. type: textblock
-#: pod/multistrap:315
+#: pod/multistrap:366
 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 "
@ -910,31 +977,76 @@ msgstr ""
 "serão adicionadas mas mais nenhuns."
 #. type: =head1
-#: pod/multistrap:321
+#: pod/multistrap:372
-msgid "Collecting packages from specific codenames/suites."
+msgid "Recommends behaviour"
 msgstr "Colher pacotes de nomes de código/conjuntos específicos."
 #. type: textblock
 #: pod/multistrap:323
 msgid ""
 "Packages specified explicitly in the configuration sections will be passed "
 "to apt as package/codename so that the configuration controls which version "
 "of a package is installed should the package exist in two sources with "
 "different suites."
 msgstr ""
 "Os pacotes especificados explicitamente nas secções de configuração serão "
 "passados ao apt como pacote/nome de código para que a configuração controle "
 "qual a versão de um pacote é instalada caso o pacote exista em duas fontes "
 "com conjuntos diferentes."
 #. type: textblock
-#: pod/multistrap:328
+#: pod/multistrap:374
 msgid ""
 "The Debian default behaviour after the Lenny release was to consider "
 "recommended packages as extra packages to be installed when any one package "
 "is selected. Recommended packages are those which the maintainer considers "
 "that would be present on C<most> installations of that package and allowing "
 "Recommends means allowing Recommends of recommended packages and so on."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:381
 msgid "The multistrap default is to turn recommends OFF."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:383
 msgid ""
 "Set the allowrecommends option to true in the General section to use typical "
 "Debian behaviour."
 msgstr ""
 #. type: =head1
 #: pod/multistrap:386
 msgid "Explicit suite specification"
 msgstr ""
 #. type: textblock
 #: pod/multistrap:388
 msgid ""
 "Sometimes, apt needs to be told to get a particular package from a "
 "particular suite, ignoring a more recent version in another suite in the "
 "same set of sources."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:392
 msgid ""
 "C<multistrap> can operate with and without the explicit suite option, the "
 "default is to let apt use the most recent version from the collection of "
 "specified F<bootstrap> sources."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:396
 msgid ""
 "Explicit suite specification has no effect on the final installed system - "
 "if your aptsources includes a repository which in turn includes a newer "
 "version of the package(s) specified explicitly, the next C<apt-get upgrade> "
 "on the device will bring in the newer version."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:401
 msgid ""
 "Also, when specifying packages to get from a specific suite, apt will also "
 "try and ensure that the dependencies for that package are also from the same "
 "suite and this can cause apt to be unable to resolve the complete set of "
 "dependencies. In this situation, being explicit about one package selection "
 "may require being explicit about some (not necessarily all) of the "
 "dependencies of that package as well."
 msgstr ""
 #. type: textblock
 #: pod/multistrap:408
 #, fuzzy
 #| msgid ""
 #| "When using this support in Lenny, ensure that each section uses the "
 #| "codename (etch, lenny, squeeze, sid) instead of the suite (oldstable, "
 #| "stable, testing, sid) for the C<suite> configuration item as the version "
 #| "of apt in Lenny and previous can only use the codename."
 msgid ""
 "When using this support in Lenny, ensure that each section uses the suite "
 "(oldstable, stable, testing, sid) and B<not> the codename (etch, lenny, "
@ -947,12 +1059,12 @@ msgstr ""
 "Lenny e anteriores apenas pode usar o nome de código."
 #. type: textblock
-#: pod/multistrap:333
+#: pod/multistrap:413
 msgid "To test, on Lenny, try:"
 msgstr ""
 #. type: verbatim
-#: pod/multistrap:335
+#: pod/multistrap:415
 #, no-wrap
 msgid ""
 " $ sudo apt-get install apt/stable\n"
@ -960,12 +1072,12 @@ msgid ""
 msgstr ""
 #. type: textblock
-#: pod/multistrap:337
+#: pod/multistrap:417
 msgid "Compare with"
 msgstr ""
 #. type: verbatim
-#: pod/multistrap:339
+#: pod/multistrap:419
 #, no-wrap
 msgid ""
 " $ sudo apt-get install apt/lenny\n"
@ -973,24 +1085,53 @@ msgid ""
 msgstr ""
 #. type: =head1
-#: pod/multistrap:341
+#: pod/multistrap:423
-msgid "Recommends TOIMPLEMENT:"
+msgid "Omitting deb-src listings"
-msgstr "Recomendações TOIMPLEMENT:"
+msgstr ""
 #. type: textblock
-#: pod/multistrap:343
+#: pod/multistrap:425
-msgid "Default recommends OFF option to set it as on."
+msgid ""
-msgstr "A predefinição recomenda que a opção OFF seja definida para ON."
+"Some multistrap environments do not need access to the Debian sources of "
 "packages being installed, typically this is required when preparing a build "
 "(or cross-build) chroot using multistrap."
 msgstr ""
 #. type: textblock
-#: device-table.pl:138
+#: pod/multistrap:429
 msgid ""
 "To turn off this additional source (and save both download time and apt-"
 "cache size), use the omitdebsrc field in each Section."
 msgstr ""
 #. type: verbatim
 #: pod/multistrap:432
 #, fuzzy, no-wrap
 msgid ""
 " [Baked]\n"
 " packages=\n"
 " source=http://www.emdebian.org/baked\n"
 " keyring=emdebian-archive-keyring\n"
 " suite=testing\n"
 " omitdebsrc=true\n"
 "\n"
 msgstr ""
 " [Debian]\n"
 " packages=\n"
 " source=http://ftp.pt.debian.org/debian\n"
 " keyring=debian-archive-keyring\n"
 " suite=lenny\n"
 "\n"
 #. type: textblock
 #: device-table.pl:140
 msgid "device-table.pl - parses simple device tables and passes to mknod"
 msgstr ""
 "device-table.pl - analisa tabelas de dispositivos simples e passa-o para o "
 "mknod"
 #. type: verbatim
-#: device-table.pl:142
+#: device-table.pl:144
 #, no-wrap
 msgid ""
 " device-table.pl [-d DIR] [-f FILE]\n"
@ -1002,7 +1143,7 @@ msgstr ""
 "\n"
 #. type: textblock
-#: device-table.pl:147
+#: device-table.pl:149
 msgid ""
 "By default, device-table.pl writes out the device nodes in the current "
 "working directory. Use the directory option to write out elsewhere."
@ -1012,7 +1153,7 @@ msgstr ""
 "sítio."
 #. type: textblock
-#: device-table.pl:150
+#: device-table.pl:152
 msgid ""
 "multistrap contains a default device-table file, use the file option to "
 "override the default /usr/share/multistrap/device-table.txt"
@ -1021,12 +1162,12 @@ msgstr ""
 "para sobrepor a predefinição /usr/share/multistrap/device-table.txt"
 #. type: textblock
-#: device-table.pl:153
+#: device-table.pl:155
 msgid "Use the dry-run option to see the commands that would be run."
 msgstr "Use  a opção dry-run para ver os comandos que seriam executados."
 #. type: textblock
-#: device-table.pl:155
+#: device-table.pl:157
 msgid ""
 "Device nodes needs fakeroot or another way to use root access. If device-"
 "table.pl is already being run under fakeroot or equivalent, use the no-"
@ -1037,6 +1178,26 @@ msgstr ""
 "equivalente, use a opção no-fakeroot para abandonar a utilização interna do "
 "fakeroot."
 #~ msgid "Collecting packages from specific codenames/suites."
 #~ msgstr "Colher pacotes de nomes de código/conjuntos específicos."
 #~ msgid ""
 #~ "Packages specified explicitly in the configuration sections will be "
 #~ "passed to apt as package/codename so that the configuration controls "
 #~ "which version of a package is installed should the package exist in two "
 #~ "sources with different suites."
 #~ msgstr ""
 #~ "Os pacotes especificados explicitamente nas secções de configuração serão "
 #~ "passados ao apt como pacote/nome de código para que a configuração "
 #~ "controle qual a versão de um pacote é instalada caso o pacote exista em "
 #~ "duas fontes com conjuntos diferentes."
 #~ msgid "Recommends TOIMPLEMENT:"
 #~ msgstr "Recomendações TOIMPLEMENT:"
 #~ msgid "Default recommends OFF option to set it as on."
 #~ msgstr "A predefinição recomenda que a opção OFF seja definida para ON."
 #~ msgid "e.g. change"
 #~ msgstr "ex. change"
--- a/117
+++ b/117
@ -31,13 +31,15 @@ use vars qw/ $progname $ourversion $dstrap $extra @aptsources $mirror
 $component $repo @dirs @touch %sources $section %keys $host $key $value
 $type $file $config $tidy $noauth $keyring %keyrings $deflist $cfgdir
 @extrapkgs @includes %source $setupsh $configsh $omitrequired $dryrun
- $omitpreinst @reinstall $tgzname %uniq %required $check @check %uniq /;
+ $omitpreinst @reinstall $tgzname %uniq %required $check @check %uniq
 $explicit_suite $allow_recommends %omitdebsrc /;
 setlocale(LC_MESSAGES, "");
 textdomain("multistrap");
 $progname = basename($0);
 $ourversion = &our_version();
 $unpack = "true";
 %omitdebsrc=();
 while( @ARGV ) {
 	$_= shift( @ARGV );
@ -264,10 +266,8 @@ foreach my $aptsrc (@debootstrap)
 		$component = (defined $components{$aptsrc}) ? $components{$aptsrc} : "main";
 		if (defined $mirror and defined $suite)
 		{
-			print SOURCES<<END;
+			print SOURCES "deb $mirror $suite $component\n";
-deb $mirror $suite $component
+			print SOURCES "deb-src $mirror $suite $component\n" if (not defined $omitdebsrc{$aptsrc});
 deb-src $mirror $suite $component
 END
 			close SOURCES;
 		}
 	}
@ -317,8 +317,6 @@ if ((not defined $omitrequired) or ($omitrequired eq "false"))
 	chomp($str);
 }
 $str .= " ";
 # instruct apt to get packages from the specified
 # suites (when the package exists in more than one).
 foreach my $sect (sort keys %packages)
 {
 	my @list = split (' ', $sect);
@ -329,7 +327,13 @@ foreach my $sect (sort keys %packages)
 		foreach my $l (@long)
 		{
 			chomp ($l);
-			$str .= " $l/$suites{$sect}" if ((defined $l) and ($l !~ /^\s*$/));
+			if (defined $explicit_suite) {
 				# instruct apt to get packages from the specified
 				# suites (when the package exists in more than one).
 				$str .= " $l/$suites{$sect}" if ((defined $l) and ($l !~ /^\s*$/));
 			} else {
 				$str .= " $l" if ((defined $l) and ($l !~ /^\s*$/));
 			}
 		}
 	}
 }
@ -401,10 +405,8 @@ foreach my $aptsrc (@aptsources)
 		$component = (defined $components{$aptsrc}) ? $components{$aptsrc} : "main";
 		if (defined $mirror and defined $suite)
 		{
-			print SOURCES<<END;
+			print SOURCES "deb $mirror $suite $component\n";
-deb $mirror $suite $component
+			print SOURCES "deb-src $mirror $suite $component\n" if (not defined $omitdebsrc{$aptsrc});
 deb-src $mirror $suite $component
 END
 			close SOURCES;
 		}
 	}
@ -902,6 +904,10 @@ sub cascade
 			$sourcedir = $keys{$section}{'retainsources'} if 
 				((defined $keys{$section}{'retainsources'}) and
 				(-d $keys{$section}{'retainsources'}));
 			$explicit_suite++ if ((defined $keys{$section}{'explicitsuite'}) and
 				($keys{$section}{'explicitsuite'} eq "true"));
 			$allow_recommends++ if ((defined $keys{$section}{'allowrecommends'}) and
 				($keys{$section}{'allowrecommends'} eq "true"));
 			my @d = split(' ', lc($keys{$section}{'debootstrap'}));
 			push @debootstrap, @d;
 			my @b = split(' ', lc($keys{$section}{'bootstrap'}));
@ -921,6 +927,8 @@ sub cascade
 				if (not exists $suites{$section});
 			$components{$section}=$keys{$section}{'components'}
 				if (not exists $components{$section});
 			$omitdebsrc{$section}=$keys{$section}{'omitdebsrc'}
 				if (not exists $omitdebsrc{$section});
 			push @reinstall, split (/ /, lc($keys{$section}{'reinstall'}));
 			if (not defined $components{$section})
 			{
@ -950,10 +958,14 @@ sub cascade
 				or ($suites{$key} =~ /squeeze/)
 				or ($suites{$key} =~ /sid/)
 				or ($suites{$key} =~ /etch/)) {
-					my $msg = sprintf (_g("Your version of apt is too old to support using a suitename like '%s'.\n" .
+					my $msg = sprintf (_g("ERROR: Your version of apt is too old to support ".
-					"You MUST use the suite and multistrap is unable to guess which one you meant.\n" .
+					"using a codename like '%s'. You MUST use the suite and multistrap is ".
-					"Use one of: oldstable, stable, stable-proposed-updates, testing, unstable or experimental.\n"), $suites{$key});
+					"unable to guess which one you meant because suites change over time. " .
-					die ($msg);
+					"Use one of: 'oldstable', 'stable', 'stable-proposed-updates', 'testing',".
 					" 'unstable' or 'experimental'. Alternatively, upgrade to version of apt ".
 					"newer than 0.7.20.2+lenny1.\n"), $suites{$key});
 					system ("echo \"$msg\" | fold -s");
 					exit 5;
 				}
 			}
 		}
@ -971,8 +983,10 @@ sub dump_config {
 		" cannot be parsed correctly."), $file);
 		warn ("\n$msg\n");
 	}
-	print "Bootstrap: ".join (", ", sort @debootstrap)."\n";
+	# Translators: followed by a list of section names from the config file.
-	print "Apt sources: ".join (", ", sort @aptsources)."\n";
+	printf ("bootstrap:\t"._g("Sections specifying packages for downloading in the bootstrap: ").join (", ", sort @debootstrap)."\n");
 	# Translators: followed by a list of section names from the config file.
 	printf ("aptsources:\t"._g("Sections specifying apt sources in the final system: ").join (", ", sort @aptsources)."\n");
 	@check=();
 	%uniq=();
 	push @check, @debootstrap;
@ -984,32 +998,71 @@ sub dump_config {
 			$msg .= sprintf (_g("ERROR: The '%s' section is not defined.\n"), $sect);
 		}
 	}
-	print "Includes: ".join (", ", sort @includes)."\n";
+	if (scalar @includes > 0) {
-	print "Sources: ".join (", ", sort values %sources)."\n";
+		printf ("include:\t"._g("Including configuration file from: ").join (", ", sort @includes)."\n");
-	print "Packages: ".join (", ", sort values %packages)."\n";
+	} else {
-	print "Suites: ".join (", ", sort values %suites)."\n";
+		printf ("include:\t"._g("No included configuration files.\n"));
-	print "Components: ".join (", ", sort values %components)."\n";
+	}
 	print "source:  \tSources: ".join (", ", sort values %sources)."\n";
 	my @long=();
 	foreach my $sect (sort keys %packages)
 	{
 		my @list = split (' ', $sect);
 		foreach my $pkg (@list)
 		{
 			next if ($packages{$pkg} =~ /^\s*$/);
 			@long=split (/ /, $packages{$sect});
 		}
 	}
 	print "packages:\tPackages: ".join (", ", sort @long)."\n";
 	print "suites:  \tSuites: ".join (", ", sort values %suites)."\n";
 	print "components\tComponents: ".join (", ", sort values %components)."\n";
 	my $msg="omitdebsrc\t"._g("Omit deb-src from sources.list for sections:");
 	foreach my $omit (sort keys %omitdebsrc) {
 		$msg .= $omitdebsrc{$omit} if (defined $omitdebsrc{$omit});
 	}
 	print "$msg\n";
 	if (defined $explicit_suite) {
 		printf("explicitsuite:\t"._g("Explicit suite selection: Yes\n"));
 	} else {
 		printf("explicitsuite:\t"._g("Explicit suite selection: No - let apt use latest.\n"));
 	}
 	if (defined $allow_recommends) {
 		printf("allowrecommends:\t"._g("Recommended packages are added to the selection.\n"));
 	} else {
 		printf("allowrecommends:\t"._g("Recommended packages are ignored.\n"));
 	}
 	print "Extra Packages: ".join (", ", sort @extrapkgs)."\n"
 		if (scalar @extrapkgs > 0);
 	print "reinstall: ".join (", ", sort (@reinstall))."\n"
 		if (scalar @reinstall > 0);
 	if (defined $arch) {
-		print "arch: $arch\n";
+		printf (_g("arch:   \tArchitecture: %s\n"), $arch);
 	} else {
 		$msg .= sprintf(_g("Cannot determine architecture from '%s'.\n"), $file);
 	}
 	if (defined $dir) {
-		print "dir: $dir\n";
+		printf ("dir:    \t"._g("Output directory: '%s'\n"), $dir);
 	} else {
 		$msg .= sprintf(_g("Cannot determine directory from '%s'.\n"), $file);
 	}
-	print "unpack: $unpack\n" if (defined $unpack);
+	printf ("unpack:   \t"._g("extract all downloaded archives: %s\n"), $unpack) if (defined $unpack);
-	print "configscript: $configsh\n" if (defined $configsh);
+	print "configscript\t: $configsh\n" if (defined $configsh);
-	print "setupscript: $setupsh\n" if (defined $setupsh);
+	print "setupscript\t: $setupsh\n" if (defined $setupsh);
-	print "omitrequired: $omitrequired\n" if (defined $omitrequired);
+	print "omitrequired\t: $omitrequired\n" if (defined $omitrequired);
-	print "tidy_apt: $tidy\n" if (defined $tidy);
+	if (defined $tidy) {
-	print "no_authentication: $noauth\n" if (defined $noauth);
+		printf ("cleanup: \t"._g("remove apt cache data: true\n"));
-	print "source_dir: $sourcedir\n" if (defined $sourcedir);
+	} else {
 		printf ("cleanup: \t"._g("remove apt cache data: false\n"));
 	}
 	if (defined $noauth) {
 		printf ("noauth:   \t"._g("allow the use of unauthenticated repositories: true\n"));
 	} else {
 		printf ("noauth:   \t"._g("allow the use of unauthenticated repositories: false\n"));
 	}
 	if (defined $sourcedir) {
 		printf ("retainsources:\t"._g("Sources will be retained in: %s\n"), $sourcedir);
 	}
 	if (defined $msg) {
 		warn ("\n$msg\n");
 		exit 1;
--- a/po/da.po
+++ b/po/da.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: multistrap\n"
 "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n"
-"POT-Creation-Date: 2010-05-05 20:22+0100\n"
+"POT-Creation-Date: 2010-05-27 16:12+0100\n"
 "PO-Revision-Date: 2010-05-13 17:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
@ -15,32 +15,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-#: ../multistrap:78
+#: ../multistrap:80
 msgid "Unknown option"
 msgstr "Ukendt tilvalg"
-#: ../multistrap:81
+#: ../multistrap:83
 #, perl-format
 msgid "Need a configuration file - use %s -f\n"
 msgstr "Kræver en konfigurationsfil - brug %s -f\n"
 #. Translators: fields are: programname, versionstring, configfile.
-#: ../multistrap:106 ../multistrap:113
+#: ../multistrap:108 ../multistrap:120
 #, perl-format
 msgid "%s %s using %s\n"
 msgstr "%s %s ved brug af %s\n"
-#: ../multistrap:119 ../multistrap:123
+#: ../multistrap:126 ../multistrap:130
 #, perl-format
 msgid "Defaulting architecture to native: %s\n"
 msgstr "Falder tilbage på oprindelig arkitektur: %s\n"
-#: ../multistrap:127
+#: ../multistrap:134
 #, perl-format
 msgid "Using foreign architecture: %s\n"
 msgstr "Bruger fremmed arkitektur: %s\n"
-#: ../multistrap:133
+#: ../multistrap:140
 #, perl-format
 msgid ""
 "No sources defined for a foreign multistrap.\n"
@ -52,62 +52,63 @@ msgstr ""
 "\tvis dem med aptsources= i '%s'."
 #. Translators: fields are: programname, architecture, host architecture.
-#: ../multistrap:141
+#: ../multistrap:148
 #, perl-format
 msgid "%s building %s multistrap on '%s'\n"
 msgstr "%s bygger %s multistrap på '%s'\n"
-#: ../multistrap:163
+#: ../multistrap:170
 #, perl-format
 msgid "Unable to create directory '%s'\n"
 msgstr "Kunne ikke oprette mappe '%s'\n"
-#: ../multistrap:199
+#: ../multistrap:206
 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr "INF: ./lib64 -> /lib symbolsk henvisning nulstil til ./lib.\n"
-#: ../multistrap:209
+#: ../multistrap:216
 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n"
 msgstr "INF: Setting ./lib64 -> ./lib symbolic link.\n"
-#: ../multistrap:249 ../multistrap:256 ../multistrap:386 ../multistrap:393
+#: ../multistrap:256 ../multistrap:263 ../multistrap:395 ../multistrap:402
 msgid "Cannot open sources list"
 msgstr "Kan ikke åbne kildeliste"
-#: ../multistrap:284
+#: ../multistrap:289
 #, perl-format
 msgid "I: Installing %s\n"
 msgstr "I: Installerer %s\n"
-#: ../multistrap:301
+#: ../multistrap:306
 #, perl-format
 msgid "Getting package lists: apt-get %s update\n"
 msgstr "Henter pakkelister: apt-get %s opdater\n"
-#: ../multistrap:303
+#: ../multistrap:308
 #, perl-format
 msgid "apt update failed. Exit value: %d\n"
 msgstr "apt update mislykkedes. Afslutningsværdi: %d\n"
-#: ../multistrap:345
+#: ../multistrap:354
 #, perl-format
 msgid "apt download failed. Exit value: %d\n"
 msgstr "apt-hentning mislykkedes. Afslutningsværdi: %d\n"
-#: ../multistrap:358
+#: ../multistrap:367
 msgid "ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n"
-msgstr "ERR: ./lib64 -> /lib symbolsk henvisning nulstil til ./lib efter udpakning.\n"
+msgstr ""
 "ERR: ./lib64 -> /lib symbolsk henvisning nulstil til ./lib efter udpakning.\n"
-#: ../multistrap:359
+#: ../multistrap:368
 #, perl-format
 msgid "ERR: Some files may have been unpacked outside %s!\n"
 msgstr "ERR: Nogle filer er måske blevet udpakket udenfor %s!\n"
-#: ../multistrap:366
+#: ../multistrap:375
 msgid "Cannot read apt sources list directory.\n"
 msgstr "Kan ikke læse apt-kildernes listemappe.\n"
-#: ../multistrap:409
+#: ../multistrap:416
 #, perl-format
 msgid ""
 "\n"
@ -116,7 +117,7 @@ msgstr ""
 "\n"
 "Multistrap system installeret i %s.\n"
-#: ../multistrap:412
+#: ../multistrap:419
 #, perl-format
 msgid ""
 "\n"
@ -125,7 +126,7 @@ msgstr ""
 "\n"
 "Pakker multistrap system i '%s' til en tarball kaldt: '%s'.\n"
-#: ../multistrap:419
+#: ../multistrap:426
 #, perl-format
 msgid ""
 "\n"
@ -134,7 +135,7 @@ msgstr ""
 "\n"
 "Fjerner kompileringsmappe: '%s'\n"
-#: ../multistrap:424
+#: ../multistrap:431
 #, perl-format
 msgid ""
 "\n"
@ -143,30 +144,30 @@ msgstr ""
 "\n"
 "Multistrap system pakket som '%s'.\n"
-#: ../multistrap:453 ../multistrap:504 ../multistrap:667
+#: ../multistrap:460 ../multistrap:511 ../multistrap:674
 msgid "Cannot read apt archives directory.\n"
 msgstr "Kan ikke læse apt-arkivets mappe.\n"
-#: ../multistrap:470
+#: ../multistrap:477
 msgid "I: Calculating obsolete packages\n"
 msgstr "I: Kalkulerer forældede pakker\n"
-#: ../multistrap:487 ../multistrap:493
+#: ../multistrap:494 ../multistrap:500
 #, perl-format
 msgid "I: Removing %s\n"
 msgstr "I: Fjerner %s\n"
-#: ../multistrap:511
+#: ../multistrap:518
 #, perl-format
 msgid "Using directory %s for unpacking operations\n"
 msgstr "Bruger mappe %s til udpakningshandlinger\n"
-#: ../multistrap:514
+#: ../multistrap:521
 #, perl-format
 msgid "I: Extracting %s...\n"
 msgstr "I: Udpakker %s...\n"
-#: ../multistrap:527
+#: ../multistrap:534
 #, perl-format
 msgid ""
 "dpkg -X failed with error code %s\n"
@ -175,53 +176,53 @@ msgstr ""
 "dpkg -X mislykkedes med fejlkode %s\n"
 "Springer over...\n"
-#: ../multistrap:567
+#: ../multistrap:574
 #, perl-format
 msgid " -> Processing conffiles for %s\n"
 msgstr " -> Behandler conffiler for %s\n"
-#: ../multistrap:588
+#: ../multistrap:595
 #, perl-format
 msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n"
 msgstr "ERR: lib64 -> ./lib symbolsk henvisning knust af %s\n"
-#: ../multistrap:591
+#: ../multistrap:598
 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr "INF: lib64 -> /lib symbolsk henvisning nulstil til ./lib.\n"
-#: ../multistrap:598
+#: ../multistrap:605
 msgid "I: Unpacking complete.\n"
 msgstr "I: Udpakning færdig.\n"
-#: ../multistrap:613
+#: ../multistrap:620
 msgid "ERR: ./bin/sh symbolic link does not exist.\n"
 msgstr "ERR: ./bin/sh symbolsk henvisning eksisterer ikke.\n"
-#: ../multistrap:616
+#: ../multistrap:623
 msgid "INF: Setting ./bin/sh -> ./bin/dash\n"
 msgstr "INF: Indstiller ./bin/sh -> ./bin/dash\n"
-#: ../multistrap:623
+#: ../multistrap:630
 msgid "INF: ./bin/dash not found. Setting ./bin/sh -> ./bin/bash\n"
 msgstr "INF: ./bin/dash ikke fundet. Indstiller ./bin/sh -> ./bin/bash\n"
-#: ../multistrap:642
+#: ../multistrap:649
 msgid "I: Tidying up apt cache and list data.\n"
 msgstr "I: Rydder op i apt-mellemlager og listedata.\n"
-#: ../multistrap:646
+#: ../multistrap:653
 msgid "Cannot read apt lists directory.\n"
 msgstr "Kan ikke læse apt-listemapper.\n"
-#: ../multistrap:655
+#: ../multistrap:662
 msgid "Cannot read apt cache directory.\n"
 msgstr "Kan ikke læse apt-mellemlagermappe.\n"
-#: ../multistrap:685
+#: ../multistrap:693
 msgid "I: Native mode - configuring unpacked packages . . .\n"
 msgstr "I: Standardtilstand - konfigurerer upakkede pakker...\n"
-#: ../multistrap:692
+#: ../multistrap:700
 #, perl-format
 msgid ""
 "I: dpkg configuration settings:\n"
@ -230,32 +231,32 @@ msgstr ""
 "I: Opsætning af dpkg-konfiguration:\n"
 "\t%s\n"
-#: ../multistrap:699
+#: ../multistrap:707
 msgid "I: Running preinst scripts with 'upgrade' argument.\n"
 msgstr "I: Kører preinst-skripter med argumentet 'upgrade'.\n"
-#: ../multistrap:725
+#: ../multistrap:733
 #, perl-format
 msgid "Cannot open %s directory. %s\n"
 msgstr "Kan ikke åben mappen %s. %s\n"
-#: ../multistrap:756
+#: ../multistrap:764
 #, perl-format
 msgid "cannot open apt sources list. %s"
 msgstr "kan ikke åbne apt-kildeliste. %s"
-#: ../multistrap:762
+#: ../multistrap:770
 #, perl-format
 msgid "cannot open apt sources.list directory %s\n"
 msgstr "kan ikke åbne apt-sources-list-mappe %s\n"
-#: ../multistrap:767
+#: ../multistrap:775
 #, perl-format
 msgid "cannot open /etc/apt/sources.list.d/%s %s"
 msgstr "kan ikke åbne /etc/apt/sources.list.d/%s %s"
-#: ../multistrap:779
+#: ../multistrap:787
-#, perl-format
+#, fuzzy, perl-format
 msgid ""
 "\n"
 "%s version %s\n"
@ -265,7 +266,7 @@ msgid ""
 " %s -?|-h|--help|--version\n"
 "\n"
 "Command:\n"
-" -f|--file CONFIG_FILE:  path the the multistrap configuration file.\n"
+" -f|--file CONFIG_FILE:  path to the multistrap configuration file.\n"
 "\n"
 "Options:\n"
 " -a|--arch ARCHITECTURE: override the configuration file architecture.\n"
@ -277,7 +278,7 @@ msgid ""
 " -?|-h|--help:           print this usage message and exit\n"
 " --version:              print this usage message and exit\n"
 "\n"
-"%s extends debootstrap to provide support for multiple\n"
+"%s replaces debootstrap to provide support for multiple\n"
 "repositories, using a configuration file to specify the relevant suites,\n"
 "architecture, extra packages and the mirror to use for each repository.\n"
 "\n"
@ -288,7 +289,7 @@ msgid ""
 "# same as --tidy-up option if set to true\n"
 "cleanup=true\n"
 "# same as --no-auth option if set to true\n"
-"# keyring packages listed in each debootstrap will\n"
+"# keyring packages listed in each bootstrap will\n"
 "# still be installed.\n"
 "noauth=false\n"
 "# extract all downloaded archives (default is true)\n"
@ -299,9 +300,9 @@ msgid ""
 "# of the target. Order is not important\n"
 "aptsources=Grip Updates\n"
 "# the order of sections is not important.\n"
-"# the debootstrap option determines which repository\n"
+"# the bootstrap option determines which repository\n"
 "# is used to calculate the list of Priority: required packages.\n"
-"debootstrap=Debian\n"
+"bootstrap=Debian\n"
 "\n"
 "[Debian]\n"
 "packages=\n"
@ -320,7 +321,7 @@ msgid ""
 "\n"
 "General settings:\n"
 "\n"
-"'directory' specifies the top level directory where the debootstrap\n"
+"'directory' specifies the top level directory where the bootstrap\n"
 "will be created - it is not packed into a .tgz once complete.\n"
 "\n"
 msgstr ""
@ -380,8 +381,10 @@ msgstr ""
 "\n"
 "'Arkitektur' og 'mappe' kan overskrives på kommandolinjen.\n"
 "\n"
-"Angiv en pakke for at udvide debootstap til at inkludere den ønskede pakke og\n"
+"Angiv en pakke for at udvide debootstap til at inkludere den ønskede pakke "
-"alle afhængigheder. Afhængigheder vil blive beregnet af apt så kun de nyeste\n"
+"og\n"
 "alle afhængigheder. Afhængigheder vil blive beregnet af apt så kun de "
 "nyeste\n"
 "kodepakker fra alle konfigurerede arkiver bruges.\n"
 "\n"
 "Generel opsætning:\n"
@ -390,12 +393,112 @@ msgstr ""
 "hvis den ikke pakkes ind i en .tgz når den først er færdig.\n"
 "\n"
-#: ../multistrap:845
+#: ../multistrap:853
 msgid "failed to write usage:"
 msgstr "kunne ikke skrive brug:"
-#: ../multistrap:951
+#: ../multistrap:961
 #, perl-format
 msgid ""
 "ERROR: Your version of apt is too old to support using a codename like '%s'. "
 "You MUST use the suite and multistrap is unable to guess which one you meant "
 "because suites change over time. Use one of: 'oldstable', 'stable', 'stable-"
 "proposed-updates', 'testing', 'unstable' or 'experimental'. Alternatively, "
 "upgrade to version of apt newer than 0.7.20.2+lenny1.\n"
 msgstr ""
 #: ../multistrap:982
 #, perl-format
 msgid "The supplied configuration file '%s' cannot be parsed correctly."
 msgstr ""
 #. Translators: followed by a list of section names from the config file.
 #: ../multistrap:987
 msgid "Sections specifying packages for downloading in the bootstrap: "
 msgstr ""
 #. Translators: followed by a list of section names from the config file.
 #: ../multistrap:989
 msgid "Sections specifying apt sources in the final system: "
 msgstr ""
 #: ../multistrap:998
 #, perl-format
 msgid "ERROR: The '%s' section is not defined.\n"
 msgstr "FEJL: Afsnittet '%s' er ikke defineret.\n"
 #: ../multistrap:1002
 #, fuzzy
 msgid "Including configuration file from: "
 msgstr "Kræver en konfigurationsfil - brug %s -f\n"
 #: ../multistrap:1004
 #, fuzzy
 msgid "No included configuration files.\n"
 msgstr "Kræver en konfigurationsfil - brug %s -f\n"
 #: ../multistrap:1020
 msgid "Omit deb-src from sources.list for sections:"
 msgstr ""
 #: ../multistrap:1026
 msgid "Explicit suite selection: Yes\n"
 msgstr ""
 #: ../multistrap:1028
 msgid "Explicit suite selection: No - let apt use latest.\n"
 msgstr ""
 #: ../multistrap:1031
 msgid "Recommended packages are added to the selection.\n"
 msgstr ""
 #: ../multistrap:1033
 msgid "Recommended packages are ignored.\n"
 msgstr ""
 #: ../multistrap:1040
 #, fuzzy, perl-format
 msgid "arch:   \tArchitecture: %s\n"
 msgstr "Bruger fremmed arkitektur: %s\n"
 #: ../multistrap:1042
 #, fuzzy, perl-format
 msgid "Cannot determine architecture from '%s'.\n"
 msgstr "Bruger fremmed arkitektur: %s\n"
 #: ../multistrap:1045
 #, fuzzy, perl-format
 msgid "Output directory: '%s'\n"
 msgstr "Kunne ikke oprette mappe '%s'\n"
 #: ../multistrap:1047
 #, fuzzy, perl-format
 msgid "Cannot determine directory from '%s'.\n"
 msgstr "Kan ikke åben mappen %s. %s\n"
 #: ../multistrap:1049
 #, perl-format
 msgid "extract all downloaded archives: %s\n"
 msgstr ""
 #: ../multistrap:1054
 msgid "remove apt cache data: true\n"
 msgstr ""
 #: ../multistrap:1056
 msgid "remove apt cache data: false\n"
 msgstr ""
 #: ../multistrap:1059
 msgid "allow the use of unauthenticated repositories: true\n"
 msgstr ""
 #: ../multistrap:1061
 msgid "allow the use of unauthenticated repositories: false\n"
 msgstr ""
 #: ../multistrap:1064
 #, perl-format
 msgid "Sources will be retained in: %s\n"
 msgstr ""
--- a/po/fr.po
+++ b/po/fr.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: multistrap\n"
 "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n"
-"POT-Creation-Date: 2010-04-05 20:59+0100\n"
+"POT-Creation-Date: 2010-05-27 16:12+0100\n"
 "PO-Revision-Date: 2010-05-06 19:06+0100\n"
 "Last-Translator: Bruno Travouillon <debian@travouillon.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@ -16,34 +16,34 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-#: ../multistrap:74
+#: ../multistrap:80
 msgid "Unknown option"
 msgstr "Option inconnue"
-#: ../multistrap:77
+#: ../multistrap:83
 #, perl-format
 msgid "Need a configuration file - use %s -f\n"
-msgstr "Veuillez indiquer le chemin du fichier de configuration comme paramètre de la commande %s -f\n"
+msgstr ""
 "Veuillez indiquer le chemin du fichier de configuration comme paramètre de "
 "la commande %s -f\n"
 #. Translators: fields are: programname, versionstring, configfile.
-#: ../multistrap:88
+#: ../multistrap:108 ../multistrap:120
 #: ../multistrap:93
 #, perl-format
 msgid "%s %s using %s\n"
 msgstr "%s %s utilise %s\n"
-#: ../multistrap:99
+#: ../multistrap:126 ../multistrap:130
 #: ../multistrap:103
 #, perl-format
 msgid "Defaulting architecture to native: %s\n"
 msgstr "Utilisation de l'architecture native %s\n"
-#: ../multistrap:107
+#: ../multistrap:134
 #, perl-format
 msgid "Using foreign architecture: %s\n"
 msgstr "Utilisation de l'architecture %s\n"
-#: ../multistrap:113
+#: ../multistrap:140
 #, perl-format
 msgid ""
 "No sources defined for a foreign multistrap.\n"
@ -51,106 +51,128 @@ msgid ""
 "\tlist them with aptsources= in '%s'."
 msgstr ""
 "Aucune source définie pour un multistrap différent.\n"
-"\tUtilisation de vos sources apt actuelles. Pour utiliser des sources différentes,\n"
+"\tUtilisation de vos sources apt actuelles. Pour utiliser des sources "
 "différentes,\n"
 "\tlistez les avec aptsources= dans « %s »."
 #. Translators: fields are: programname, architecture, host architecture.
-#: ../multistrap:121
+#: ../multistrap:148
 #, perl-format
 msgid "%s building %s multistrap on '%s'\n"
 msgstr "%s construit un multistrap pour l'architecture « %s » sur « %s »\n"
-#. system ("mkdir -p ${dir}/usr/share/doc/gcc-4.2-base/")
+#: ../multistrap:170
 #. if (not -d "${dir}/usr/share/doc/gcc-4.2-base/");
 #. system ("touch ${dir}/usr/share/doc/gcc-4.2-base/.copyright");
 #. system ("touch ${dir}/usr/share/doc/gcc-4.2-base/#changelog.Debian.gz");
 #: ../multistrap:149
 #, perl-format
 msgid "Unable to create directory '%s'\n"
 msgstr "Impossible de créer le répertoire « %s »\n"
-#: ../multistrap:185
+#: ../multistrap:206
 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n"
-msgstr "INF : le lien symbolique ./lib64 -> /lib pointe maintenant vers ./lib.\n"
+msgstr ""
 "INF : le lien symbolique ./lib64 -> /lib pointe maintenant vers ./lib.\n"
-#: ../multistrap:195
+#: ../multistrap:216
 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n"
 msgstr "INF : définition du lien symbolique ./lib64 -> ./lib.\n"
-#: ../multistrap:228
+#: ../multistrap:256 ../multistrap:263 ../multistrap:395 ../multistrap:402
 #: ../multistrap:235
 #: ../multistrap:337
 #: ../multistrap:344
 msgid "Cannot open sources list"
 msgstr "Impossible d'ouvrir la liste des sources"
-#: ../multistrap:260
+#: ../multistrap:289
 #, perl-format
 msgid "I: Installing %s\n"
 msgstr "I : installation de %s\n"
-#: ../multistrap:277
+#: ../multistrap:306
 #, perl-format
 msgid "Getting package lists: apt-get %s update\n"
 msgstr "Téléchargement de la liste des paquets : apt-get %s update\n"
-#: ../multistrap:279
+#: ../multistrap:308
 #, perl-format
 msgid "apt update failed. Exit value: %d\n"
 msgstr "Échec de la mise à jour apt. Code de sortie : %d\n"
-#: ../multistrap:310
+#: ../multistrap:354
 #, perl-format
 msgid "apt download failed. Exit value: %d\n"
 msgstr "Échec du téléchargement apt. Code de sortie : %d\n"
-#: ../multistrap:322
+#: ../multistrap:367
 msgid "ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n"
-msgstr "ERR : le lien symbolique ./lib64 -> /lib pointera vers ./lib après le dépaquetage.\n"
+msgstr ""
 "ERR : le lien symbolique ./lib64 -> /lib pointera vers ./lib après le "
 "dépaquetage.\n"
-#: ../multistrap:323
+#: ../multistrap:368
 #, perl-format
 msgid "ERR: Some files may have been unpacked outside %s!\n"
 msgstr "ERR : certains fichiers ont été dépaquetés hors de %s !\n"
-#: ../multistrap:327
+#: ../multistrap:375
-#, perl-format
+#, fuzzy
 msgid "Cannot read apt sources list directory.\n"
 msgstr "Impossible d'accéder au répertoire des listes apt.\n"
 #: ../multistrap:416
 #, fuzzy, perl-format
 msgid ""
 "\n"
 "Multistrap system installed successfully in %s.\n"
 "\n"
 msgstr ""
 "\n"
 "Le système multistrap est installé avec succès dans %s.\n"
 "\n"
-#: ../multistrap:382
+#: ../multistrap:419
-#: ../multistrap:433
+#, perl-format
-#: ../multistrap:596
+msgid ""
 "\n"
 "Compressing multistrap system in '%s' to a tarball called: '%s'.\n"
 msgstr ""
 #: ../multistrap:426
 #, perl-format
 msgid ""
 "\n"
 "Removing build directory: '%s'\n"
 msgstr ""
 #: ../multistrap:431
 #, fuzzy, perl-format
 msgid ""
 "\n"
 "Multistrap system packaged successfully as '%s'.\n"
 msgstr ""
 "\n"
 "Le système multistrap est installé avec succès dans %s.\n"
 "\n"
 #: ../multistrap:460 ../multistrap:511 ../multistrap:674
 msgid "Cannot read apt archives directory.\n"
 msgstr "Impossible d'accéder au répertoire des archives apt.\n"
-#: ../multistrap:399
+#: ../multistrap:477
 msgid "I: Calculating obsolete packages\n"
 msgstr "I : identification des paquets obsolètes\n"
-#: ../multistrap:416
+#: ../multistrap:494 ../multistrap:500
 #: ../multistrap:422
 #, perl-format
 msgid "I: Removing %s\n"
 msgstr "I : suppression de %s\n"
-#: ../multistrap:440
+#: ../multistrap:518
 #, perl-format
 msgid "Using directory %s for unpacking operations\n"
 msgstr "Utilisation du répertoire %s pour les opérations de dépaquetage\n"
-#: ../multistrap:443
+#: ../multistrap:521
 #, perl-format
 msgid "I: Extracting %s...\n"
 msgstr "I : extraction de %s...\n"
-#: ../multistrap:456
+#: ../multistrap:534
 #, perl-format
 msgid ""
 "dpkg -X failed with error code %s\n"
@ -159,55 +181,57 @@ msgstr ""
 "dpkg -X a échoué avec le code d'erreur %s\n"
 "Annulation...\n"
-#: ../multistrap:496
+#: ../multistrap:574
 #, perl-format
 msgid " -> Processing conffiles for %s\n"
 msgstr " -> Traitement des fichiers de configuration pour %s\n"
-#: ../multistrap:517
+#: ../multistrap:595
 #, perl-format
 msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n"
 msgstr "ERR : le lien symbolique lib64 -> ./lib est remplacé par %s\n"
-#: ../multistrap:520
+#: ../multistrap:598
 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr "INF : le lien symbolique lib64 -> /lib pointe maintenant vers ./lib.\n"
-#: ../multistrap:527
+#: ../multistrap:605
 msgid "I: Unpacking complete.\n"
 msgstr "I : dépaquetage terminé.\n"
-#: ../multistrap:542
+#: ../multistrap:620
 msgid "ERR: ./bin/sh symbolic link does not exist.\n"
 msgstr "ERR : le lien symbolique ./bin/sh n'existe pas.\n"
-#: ../multistrap:545
+#: ../multistrap:623
 msgid "INF: Setting ./bin/sh -> ./bin/dash\n"
 msgstr "INF : définition du lien symbolique ./bin/sh -> ./bin/dash\n"
-#: ../multistrap:552
+#: ../multistrap:630
 msgid "INF: ./bin/dash not found. Setting ./bin/sh -> ./bin/bash\n"
-msgstr "INF : ./bin/dash introuvable. Définition du lien symbolique ./bin/sh -> ./bin/bash\n"
+msgstr ""
 "INF : ./bin/dash introuvable. Définition du lien symbolique ./bin/sh -> ./"
 "bin/bash\n"
-#: ../multistrap:571
+#: ../multistrap:649
 msgid "I: Tidying up apt cache and list data.\n"
 msgstr "I : nettoyage du cache apt et des listes de données.\n"
-#: ../multistrap:575
+#: ../multistrap:653
 msgid "Cannot read apt lists directory.\n"
 msgstr "Impossible d'accéder au répertoire des listes apt.\n"
-#: ../multistrap:584
+#: ../multistrap:662
 msgid "Cannot read apt cache directory.\n"
 msgstr "Impossible d'accéder au répertoire du cache apt.\n"
 # msgid "Cannot read apt archives directory.\n
 # msgstr "Impossible d'accéder au répertoire des archives apt.\n
-#: ../multistrap:614
+#: ../multistrap:693
 msgid "I: Native mode - configuring unpacked packages . . .\n"
 msgstr "I : mode natif, configure les paquets décompressés...\n"
-#: ../multistrap:621
+#: ../multistrap:700
 #, perl-format
 msgid ""
 "I: dpkg configuration settings:\n"
@ -216,28 +240,32 @@ msgstr ""
 "I : paramètres de configuration de dpkg :\n"
 "\t%s\n"
-#: ../multistrap:636
+#: ../multistrap:707
 msgid "I: Running preinst scripts with 'upgrade' argument.\n"
 msgstr ""
 #: ../multistrap:733
 #, perl-format
 msgid "Cannot open %s directory. %s\n"
 msgstr "Impossible d'accéder au répertoire %s. %s\n"
-#: ../multistrap:668
+#: ../multistrap:764
 #, perl-format
 msgid "cannot open apt sources list. %s"
 msgstr "Impossible d'accéder à la liste des sources apt. %s"
-#: ../multistrap:674
+#: ../multistrap:770
 #, perl-format
 msgid "cannot open apt sources.list directory %s\n"
 msgstr "Impossible d'accéder au répertoire des sources apt %s\n"
-#: ../multistrap:679
+#: ../multistrap:775
 #, perl-format
 msgid "cannot open /etc/apt/sources.list.d/%s %s"
 msgstr "Impossible d'accéder à /etc/apt/sources.list.d/%s %s"
-#: ../multistrap:691
+#: ../multistrap:787
-#, perl-format
+#, fuzzy, perl-format
 msgid ""
 "\n"
 "%s version %s\n"
@ -247,17 +275,19 @@ msgid ""
 " %s -?|-h|--help|--version\n"
 "\n"
 "Command:\n"
-" -f|--file CONFIG_FILE:  path the the multistrap configuration file.\n"
+" -f|--file CONFIG_FILE:  path to the multistrap configuration file.\n"
 "\n"
 "Options:\n"
 " -a|--arch ARCHITECTURE: override the configuration file architecture.\n"
 " -d|--dir PATH:          override the configuration file directory.\n"
 "    --no-auth:           do not use Secure Apt for any repositories\n"
 "    --tidy-up:           remove apt cache data and downloaded archives.\n"
 "    --dry-run:           output the configuration and exit\n"
 "    --simulate:          output the configuration and exit\n"
 " -?|-h|--help:           print this usage message and exit\n"
 " --version:              print this usage message and exit\n"
 "\n"
-"%s extends debootstrap to provide support for multiple\n"
+"%s replaces debootstrap to provide support for multiple\n"
 "repositories, using a configuration file to specify the relevant suites,\n"
 "architecture, extra packages and the mirror to use for each repository.\n"
 "\n"
@ -268,19 +298,20 @@ msgid ""
 "# same as --tidy-up option if set to true\n"
 "cleanup=true\n"
 "# same as --no-auth option if set to true\n"
-"# keyring packages listed in each debootstrap will\n"
+"# keyring packages listed in each bootstrap will\n"
 "# still be installed.\n"
 "noauth=false\n"
 "# extract all downloaded archives (default is true)\n"
 "unpack=true\n"
 "# aptsources is a list of sections to be used for downloading packages\n"
-"# and lists and placed in the /etc/apt/sources.list.d/multistrap.sources.list\n"
+"# and lists and placed in 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 debootstrap option determines which repository\n"
+"# the bootstrap option determines which repository\n"
 "# is used to calculate the list of Priority: required packages.\n"
-"debootstrap=Debian\n"
+"bootstrap=Debian\n"
 "\n"
 "[Debian]\n"
 "packages=\n"
@ -299,7 +330,7 @@ msgid ""
 "\n"
 "General settings:\n"
 "\n"
-"'directory' specifies the top level directory where the debootstrap\n"
+"'directory' specifies the top level directory where the bootstrap\n"
 "will be created - it is not packed into a .tgz once complete.\n"
 "\n"
 msgstr ""
@ -311,19 +342,25 @@ msgstr ""
 "%s -?|-h|--help|--version\n"
 "\n"
 "Commande :\n"
-" -f|--file FICHIER_CONFIG : chemin du fichier de configuration de multistrap.\n"
+" -f|--file FICHIER_CONFIG : chemin du fichier de configuration de "
 "multistrap.\n"
 "\n"
 "Options :\n"
-" -a|--arch ARCHITECTURE : remplacer l'architecture du fichier de configuration.\n"
+" -a|--arch ARCHITECTURE : remplacer l'architecture du fichier de "
-" -d|--dir RÉPERTOIRE :    remplacer le répertoire du fichier de configuration.\n"
+"configuration.\n"
-"    --no-auth :           autoriser l'utilisation de dépôts non authentifiés.\n"
+" -d|--dir RÉPERTOIRE :    remplacer le répertoire du fichier de "
-"    --tidy-up :           supprimer les données du cache d'apt et les archives téléchargés.\n"
+"configuration.\n"
 "    --no-auth :           autoriser l'utilisation de dépôts non "
 "authentifiés.\n"
 "    --tidy-up :           supprimer les données du cache d'apt et les "
 "archives téléchargés.\n"
 " -?|-h|--help :           afficher l'aide-mémoire et quitter\n"
 " --version :              afficher l'aide-mémoire et quitter\n"
 "\n"
 "%s, basé sur debootstrap, permet la gestion de dépôts multiples\n"
 "en utilisant un fichier de configuration pour spécifier les suites,\n"
-"l'architecture, les paquets supplémentaires et le miroir à utiliser pour chaque dépôt.\n"
+"l'architecture, les paquets supplémentaires et le miroir à utiliser pour "
 "chaque dépôt.\n"
 "\n"
 "Exemple de configuration :\n"
 "\n"
@ -338,8 +375,10 @@ msgstr ""
 "noauth=false\n"
 "# extraire toutes les archives téléchargées (vrai par défaut)\n"
 "unpack=true\n"
-"# aptsources contient la liste des sections à utiliser pour télécharger les paquets,\n"
+"# aptsources contient la liste des sections à utiliser pour télécharger les "
-"# les lister et les placer dans le fichier /etc/apt/sources.list.d/multistrap.sources.list\n"
+"paquets,\n"
 "# les lister et les placer dans le fichier /etc/apt/sources.list.d/"
 "multistrap.sources.list\n"
 "# de la cible. L'ordre n'a pas d'importance.\n"
 "aptsources=Grip Updates\n"
 "# l'ordre des sections n'est pas important.\n"
@ -361,15 +400,124 @@ msgstr ""
 "\n"
 "Spécifiez un paquet pour étendre le debootstrap afin d'inclure ce paquet et\n"
 "toutes ses dépendances. Les dépendances seront identifiées par apt afin\n"
-"d'utiliser uniquement la version la plus récente de tous les dépôts configurés.\n"
+"d'utiliser uniquement la version la plus récente de tous les dépôts "
 "configurés.\n"
 "\n"
 "Paramètres généraux :\n"
 "« directory » indique le répertoire de base dans lequel le debootstrap\n"
 "sera créé. Il n'est pas empaqueté dans un .tgz une fois complété.\n"
 "\n"
-#: ../multistrap:755
+#: ../multistrap:853
 msgid "failed to write usage:"
 msgstr "Impossible d'afficher l'aide :"
 #: ../multistrap:961
 #, perl-format
 msgid ""
 "ERROR: Your version of apt is too old to support using a codename like '%s'. "
 "You MUST use the suite and multistrap is unable to guess which one you meant "
 "because suites change over time. Use one of: 'oldstable', 'stable', 'stable-"
 "proposed-updates', 'testing', 'unstable' or 'experimental'. Alternatively, "
 "upgrade to version of apt newer than 0.7.20.2+lenny1.\n"
 msgstr ""
 #: ../multistrap:982
 #, perl-format
 msgid "The supplied configuration file '%s' cannot be parsed correctly."
 msgstr ""
 #. Translators: followed by a list of section names from the config file.
 #: ../multistrap:987
 msgid "Sections specifying packages for downloading in the bootstrap: "
 msgstr ""
 #. Translators: followed by a list of section names from the config file.
 #: ../multistrap:989
 msgid "Sections specifying apt sources in the final system: "
 msgstr ""
 #: ../multistrap:998
 #, perl-format
 msgid "ERROR: The '%s' section is not defined.\n"
 msgstr ""
 #: ../multistrap:1002
 #, fuzzy
 msgid "Including configuration file from: "
 msgstr ""
 "Veuillez indiquer le chemin du fichier de configuration comme paramètre de "
 "la commande %s -f\n"
 #: ../multistrap:1004
 #, fuzzy
 msgid "No included configuration files.\n"
 msgstr ""
 "Veuillez indiquer le chemin du fichier de configuration comme paramètre de "
 "la commande %s -f\n"
 #: ../multistrap:1020
 msgid "Omit deb-src from sources.list for sections:"
 msgstr ""
 #: ../multistrap:1026
 msgid "Explicit suite selection: Yes\n"
 msgstr ""
 #: ../multistrap:1028
 msgid "Explicit suite selection: No - let apt use latest.\n"
 msgstr ""
 #: ../multistrap:1031
 msgid "Recommended packages are added to the selection.\n"
 msgstr ""
 #: ../multistrap:1033
 msgid "Recommended packages are ignored.\n"
 msgstr ""
 #: ../multistrap:1040
 #, fuzzy, perl-format
 msgid "arch:   \tArchitecture: %s\n"
 msgstr "Utilisation de l'architecture %s\n"
 #: ../multistrap:1042
 #, fuzzy, perl-format
 msgid "Cannot determine architecture from '%s'.\n"
 msgstr "Utilisation de l'architecture %s\n"
 #: ../multistrap:1045
 #, fuzzy, perl-format
 msgid "Output directory: '%s'\n"
 msgstr "Impossible de créer le répertoire « %s »\n"
 #: ../multistrap:1047
 #, fuzzy, perl-format
 msgid "Cannot determine directory from '%s'.\n"
 msgstr "Impossible d'accéder au répertoire %s. %s\n"
 #: ../multistrap:1049
 #, perl-format
 msgid "extract all downloaded archives: %s\n"
 msgstr ""
 #: ../multistrap:1054
 msgid "remove apt cache data: true\n"
 msgstr ""
 #: ../multistrap:1056
 msgid "remove apt cache data: false\n"
 msgstr ""
 #: ../multistrap:1059
 msgid "allow the use of unauthenticated repositories: true\n"
 msgstr ""
 #: ../multistrap:1061
 msgid "allow the use of unauthenticated repositories: false\n"
 msgstr ""
 #: ../multistrap:1064
 #, perl-format
 msgid "Sources will be retained in: %s\n"
 msgstr ""
--- a/po/pt.po
+++ b/po/pt.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: emdebian-rootfs_2.1.4\n"
 "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n"
-"POT-Creation-Date: 2010-04-05 20:59+0100\n"
+"POT-Creation-Date: 2010-05-27 16:12+0100\n"
 "PO-Revision-Date: 2010-05-09 12:45+0100\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@ -15,32 +15,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-#: ../multistrap:74
+#: ../multistrap:80
 msgid "Unknown option"
 msgstr "Opção desconhecida"
-#: ../multistrap:77
+#: ../multistrap:83
 #, perl-format
 msgid "Need a configuration file - use %s -f\n"
 msgstr "É necessário um ficheiro de configuração - use %s -f\n"
 #. Translators: fields are: programname, versionstring, configfile.
-#: ../multistrap:88 ../multistrap:93
+#: ../multistrap:108 ../multistrap:120
 #, perl-format
 msgid "%s %s using %s\n"
 msgstr "%s %s a usar %s\n"
-#: ../multistrap:99 ../multistrap:103
+#: ../multistrap:126 ../multistrap:130
 #, perl-format
 msgid "Defaulting architecture to native: %s\n"
 msgstr "A usar a arquitectura nativa padrão: %s\n"
-#: ../multistrap:107
+#: ../multistrap:134
 #, perl-format
 msgid "Using foreign architecture: %s\n"
 msgstr "A usar arquitectura estrangeira: %s\n"
-#: ../multistrap:113
+#: ../multistrap:140
 #, perl-format
 msgid ""
 "No sources defined for a foreign multistrap.\n"
@ -52,98 +52,122 @@ msgstr ""
 "\te listá-las com aptsources= em '%s'."
 #. Translators: fields are: programname, architecture, host architecture.
-#: ../multistrap:121
+#: ../multistrap:148
 #, perl-format
 msgid "%s building %s multistrap on '%s'\n"
 msgstr "%s a criar multistrap para %s em '%s'\n"
-#. system ("mkdir -p ${dir}/usr/share/doc/gcc-4.2-base/")
+#: ../multistrap:170
 #. if (not -d "${dir}/usr/share/doc/gcc-4.2-base/");
 #. system ("touch ${dir}/usr/share/doc/gcc-4.2-base/.copyright");
 #. system ("touch ${dir}/usr/share/doc/gcc-4.2-base/#changelog.Debian.gz");
 #: ../multistrap:149
 #, perl-format
 msgid "Unable to create directory '%s'\n"
 msgstr "Não foi possível criar o directório '%s'\n"
-#: ../multistrap:185
+#: ../multistrap:206
 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr "INF: link simbólico ./lib64 -> /lib reposto para ./lib.\n"
-#: ../multistrap:195
+#: ../multistrap:216
 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n"
 msgstr "INF: A definir link simbólico ./lib64 -> ./lib.\n"
-#: ../multistrap:228 ../multistrap:235 ../multistrap:337 ../multistrap:344
+#: ../multistrap:256 ../multistrap:263 ../multistrap:395 ../multistrap:402
 msgid "Cannot open sources list"
 msgstr "Impossível abrir lista de fontes"
-#: ../multistrap:260
+#: ../multistrap:289
 #, perl-format
 msgid "I: Installing %s\n"
 msgstr "I: A instalar %s\n"
-#: ../multistrap:277
+#: ../multistrap:306
 #, perl-format
 msgid "Getting package lists: apt-get %s update\n"
 msgstr "A obter listas de pacotes: apt-get %s update\n"
-#: ../multistrap:279
+#: ../multistrap:308
 #, perl-format
 msgid "apt update failed. Exit value: %d\n"
 msgstr "apt update falhou. Valor de saída: %d\n"
-#: ../multistrap:310
+#: ../multistrap:354
 #, perl-format
 msgid "apt download failed. Exit value: %d\n"
 msgstr "apt download falhou. Valor de saída: %d\n"
-#: ../multistrap:322
+#: ../multistrap:367
 msgid "ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n"
 msgstr ""
 "ERRO: link simbólico ./lib64 -> /lib reposto para ./lib após "
 "desempacotamento.\n"
-#: ../multistrap:323
+#: ../multistrap:368
 #, perl-format
 msgid "ERR: Some files may have been unpacked outside %s!\n"
 msgstr "ERRO: Alguns ficheiros podem ter sido desempacotados fora de %s!\n"
-#: ../multistrap:327
+#: ../multistrap:375
-#, perl-format
+#, fuzzy
 msgid "Cannot read apt sources list directory.\n"
 msgstr "Impossível ler directório de listas apt.\n"
 #: ../multistrap:416
 #, fuzzy, perl-format
 msgid ""
 "\n"
 "Multistrap system installed successfully in %s.\n"
 "\n"
 msgstr ""
 "\n"
 "Sistema multistrap instalado com sucesso em %s.\n"
 "\n"
-#: ../multistrap:382 ../multistrap:433 ../multistrap:596
+#: ../multistrap:419
 #, perl-format
 msgid ""
 "\n"
 "Compressing multistrap system in '%s' to a tarball called: '%s'.\n"
 msgstr ""
 #: ../multistrap:426
 #, perl-format
 msgid ""
 "\n"
 "Removing build directory: '%s'\n"
 msgstr ""
 #: ../multistrap:431
 #, fuzzy, perl-format
 msgid ""
 "\n"
 "Multistrap system packaged successfully as '%s'.\n"
 msgstr ""
 "\n"
 "Sistema multistrap instalado com sucesso em %s.\n"
 "\n"
 #: ../multistrap:460 ../multistrap:511 ../multistrap:674
 msgid "Cannot read apt archives directory.\n"
 msgstr "Impossível ler o directório de arquivos apt.\n"
-#: ../multistrap:399
+#: ../multistrap:477
 msgid "I: Calculating obsolete packages\n"
 msgstr "I: A calcular pacotes obsoletos\n"
-#: ../multistrap:416 ../multistrap:422
+#: ../multistrap:494 ../multistrap:500
 #, perl-format
 msgid "I: Removing %s\n"
 msgstr "I: A remover %s\n"
-#: ../multistrap:440
+#: ../multistrap:518
 #, perl-format
 msgid "Using directory %s for unpacking operations\n"
 msgstr "A usar o directório %s para operações de desempacotamento\n"
-#: ../multistrap:443
+#: ../multistrap:521
 #, perl-format
 msgid "I: Extracting %s...\n"
 msgstr "I: A extrair %s...\n"
-#: ../multistrap:456
+#: ../multistrap:534
 #, perl-format
 msgid ""
 "dpkg -X failed with error code %s\n"
@ -152,55 +176,55 @@ msgstr ""
 "dpkg -X falhou com o código de erro %s\n"
 "A saltar....\n"
-#: ../multistrap:496
+#: ../multistrap:574
 #, perl-format
 msgid " -> Processing conffiles for %s\n"
 msgstr " -> A processar ficheiros de configuração para %s\n"
-#: ../multistrap:517
+#: ../multistrap:595
 #, perl-format
 msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n"
 msgstr "ERRO: link simbólico lib64 -> ./lib ocultado por %s\n"
-#: ../multistrap:520
+#: ../multistrap:598
 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr "INF: link simbólico lib64 -> /lib reposto para ./lib.\n"
-#: ../multistrap:527
+#: ../multistrap:605
 msgid "I: Unpacking complete.\n"
 msgstr "I: Desempacotamento completo.\n"
-#: ../multistrap:542
+#: ../multistrap:620
 msgid "ERR: ./bin/sh symbolic link does not exist.\n"
 msgstr "ERRO: link simbólico ./bin/sh não existe.\n"
-#: ../multistrap:545
+#: ../multistrap:623
 msgid "INF: Setting ./bin/sh -> ./bin/dash\n"
 msgstr "INF: A definir link simbólico ./bin/sh -> ./bin/dash\n"
-#: ../multistrap:552
+#: ../multistrap:630
 msgid "INF: ./bin/dash not found. Setting ./bin/sh -> ./bin/bash\n"
 msgstr "INF: ./bin/dash não foi encontrado. A definir ./bin/sh -> ./bin/bash\n"
-#: ../multistrap:571
+#: ../multistrap:649
 msgid "I: Tidying up apt cache and list data.\n"
 msgstr "I: A arrumar dados de lista e de apt cache.\n"
-#: ../multistrap:575
+#: ../multistrap:653
 msgid "Cannot read apt lists directory.\n"
 msgstr "Impossível ler directório de listas apt.\n"
-#: ../multistrap:584
+#: ../multistrap:662
 msgid "Cannot read apt cache directory.\n"
 msgstr "Impossível ler directório de cache apt.\n"
 # msgid "Cannot read apt archives directory.\n"
 # msgstr "Impossível ler directório/ de arquivos apt.\n"
-#: ../multistrap:614
+#: ../multistrap:693
 msgid "I: Native mode - configuring unpacked packages . . .\n"
 msgstr "I: Modo nativo - a configurar pacotes desempacotados . . .\n"
-#: ../multistrap:621
+#: ../multistrap:700
 #, perl-format
 msgid ""
 "I: dpkg configuration settings:\n"
@ -209,28 +233,32 @@ msgstr ""
 "I: opções de configuração do dpkg:\n"
 "\t%s\n"
-#: ../multistrap:636
+#: ../multistrap:707
 msgid "I: Running preinst scripts with 'upgrade' argument.\n"
 msgstr ""
 #: ../multistrap:733
 #, perl-format
 msgid "Cannot open %s directory. %s\n"
 msgstr "Impossível abrir o directório %s. %s\n"
-#: ../multistrap:668
+#: ../multistrap:764
 #, perl-format
 msgid "cannot open apt sources list. %s"
 msgstr "impossível abrir lista de fontes apt. %s"
-#: ../multistrap:674
+#: ../multistrap:770
 #, perl-format
 msgid "cannot open apt sources.list directory %s\n"
 msgstr "impossível abrir directório de apt sources.list %s\n"
-#: ../multistrap:679
+#: ../multistrap:775
 #, perl-format
 msgid "cannot open /etc/apt/sources.list.d/%s %s"
 msgstr "impossível abrir /etc/apt/sources.list.d/%s %s"
-#: ../multistrap:691
+#: ../multistrap:787
-#, perl-format
+#, fuzzy, perl-format
 msgid ""
 "\n"
 "%s version %s\n"
@ -240,17 +268,19 @@ msgid ""
 " %s -?|-h|--help|--version\n"
 "\n"
 "Command:\n"
-" -f|--file CONFIG_FILE:  path the the multistrap configuration file.\n"
+" -f|--file CONFIG_FILE:  path to the multistrap configuration file.\n"
 "\n"
 "Options:\n"
 " -a|--arch ARCHITECTURE: override the configuration file architecture.\n"
 " -d|--dir PATH:          override the configuration file directory.\n"
 "    --no-auth:           do not use Secure Apt for any repositories\n"
 "    --tidy-up:           remove apt cache data and downloaded archives.\n"
 "    --dry-run:           output the configuration and exit\n"
 "    --simulate:          output the configuration and exit\n"
 " -?|-h|--help:           print this usage message and exit\n"
 " --version:              print this usage message and exit\n"
 "\n"
-"%s extends debootstrap to provide support for multiple\n"
+"%s replaces debootstrap to provide support for multiple\n"
 "repositories, using a configuration file to specify the relevant suites,\n"
 "architecture, extra packages and the mirror to use for each repository.\n"
 "\n"
@ -261,7 +291,7 @@ msgid ""
 "# same as --tidy-up option if set to true\n"
 "cleanup=true\n"
 "# same as --no-auth option if set to true\n"
-"# keyring packages listed in each debootstrap will\n"
+"# keyring packages listed in each bootstrap will\n"
 "# still be installed.\n"
 "noauth=false\n"
 "# extract all downloaded archives (default is true)\n"
@ -272,9 +302,9 @@ msgid ""
 "# of the target. Order is not important\n"
 "aptsources=Grip Updates\n"
 "# the order of sections is not important.\n"
-"# the debootstrap option determines which repository\n"
+"# the bootstrap option determines which repository\n"
 "# is used to calculate the list of Priority: required packages.\n"
-"debootstrap=Debian\n"
+"bootstrap=Debian\n"
 "\n"
 "[Debian]\n"
 "packages=\n"
@ -293,7 +323,7 @@ msgid ""
 "\n"
 "General settings:\n"
 "\n"
-"'directory' specifies the top level directory where the debootstrap\n"
+"'directory' specifies the top level directory where the bootstrap\n"
 "will be created - it is not packed into a .tgz once complete.\n"
 "\n"
 msgstr ""
@ -367,10 +397,116 @@ msgstr ""
 "será criado - não será empacotado num .tgz após ficar completo.\n"
 "\n"
-#: ../multistrap:755
+#: ../multistrap:853
 msgid "failed to write usage:"
 msgstr "falhou a escrita do modo de utilização:"
 #: ../multistrap:961
 #, perl-format
 msgid ""
 "ERROR: Your version of apt is too old to support using a codename like '%s'. "
 "You MUST use the suite and multistrap is unable to guess which one you meant "
 "because suites change over time. Use one of: 'oldstable', 'stable', 'stable-"
 "proposed-updates', 'testing', 'unstable' or 'experimental'. Alternatively, "
 "upgrade to version of apt newer than 0.7.20.2+lenny1.\n"
 msgstr ""
 #: ../multistrap:982
 #, perl-format
 msgid "The supplied configuration file '%s' cannot be parsed correctly."
 msgstr ""
 #. Translators: followed by a list of section names from the config file.
 #: ../multistrap:987
 msgid "Sections specifying packages for downloading in the bootstrap: "
 msgstr ""
 #. Translators: followed by a list of section names from the config file.
 #: ../multistrap:989
 msgid "Sections specifying apt sources in the final system: "
 msgstr ""
 #: ../multistrap:998
 #, perl-format
 msgid "ERROR: The '%s' section is not defined.\n"
 msgstr ""
 #: ../multistrap:1002
 #, fuzzy
 msgid "Including configuration file from: "
 msgstr "É necessário um ficheiro de configuração - use %s -f\n"
 #: ../multistrap:1004
 #, fuzzy
 msgid "No included configuration files.\n"
 msgstr "É necessário um ficheiro de configuração - use %s -f\n"
 #: ../multistrap:1020
 msgid "Omit deb-src from sources.list for sections:"
 msgstr ""
 #: ../multistrap:1026
 msgid "Explicit suite selection: Yes\n"
 msgstr ""
 #: ../multistrap:1028
 msgid "Explicit suite selection: No - let apt use latest.\n"
 msgstr ""
 #: ../multistrap:1031
 msgid "Recommended packages are added to the selection.\n"
 msgstr ""
 #: ../multistrap:1033
 msgid "Recommended packages are ignored.\n"
 msgstr ""
 #: ../multistrap:1040
 #, fuzzy, perl-format
 msgid "arch:   \tArchitecture: %s\n"
 msgstr "A usar arquitectura estrangeira: %s\n"
 #: ../multistrap:1042
 #, fuzzy, perl-format
 msgid "Cannot determine architecture from '%s'.\n"
 msgstr "A usar arquitectura estrangeira: %s\n"
 #: ../multistrap:1045
 #, fuzzy, perl-format
 msgid "Output directory: '%s'\n"
 msgstr "Não foi possível criar o directório '%s'\n"
 #: ../multistrap:1047
 #, fuzzy, perl-format
 msgid "Cannot determine directory from '%s'.\n"
 msgstr "Impossível abrir o directório %s. %s\n"
 #: ../multistrap:1049
 #, perl-format
 msgid "extract all downloaded archives: %s\n"
 msgstr ""
 #: ../multistrap:1054
 msgid "remove apt cache data: true\n"
 msgstr ""
 #: ../multistrap:1056
 msgid "remove apt cache data: false\n"
 msgstr ""
 #: ../multistrap:1059
 msgid "allow the use of unauthenticated repositories: true\n"
 msgstr ""
 #: ../multistrap:1061
 msgid "allow the use of unauthenticated repositories: false\n"
 msgstr ""
 #: ../multistrap:1064
 #, perl-format
 msgid "Sources will be retained in: %s\n"
 msgstr ""
 #, fuzzy
 #~ msgid "Using shortcut file: %s\n"
 #~ msgstr "A usar arquitectura estrangeira: %s\n"
--- a/po/vi.po
+++ b/po/vi.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: multistrap 2.1.4\n"
 "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n"
-"POT-Creation-Date: 2010-05-08 11:40+0100\n"
+"POT-Creation-Date: 2010-05-27 16:12+0100\n"
 "PO-Revision-Date: 2010-05-07 18:01+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@ -16,32 +16,32 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
-#: ../multistrap:78
+#: ../multistrap:80
 msgid "Unknown option"
 msgstr "Không rõ tuỳ chọn"
-#: ../multistrap:81
+#: ../multistrap:83
 #, perl-format
 msgid "Need a configuration file - use %s -f\n"
 msgstr "Yêu cầu một tập tin cấu hình: dùng « %s -f »\n"
 #. Translators: fields are: programname, versionstring, configfile.
-#: ../multistrap:106 ../multistrap:118
+#: ../multistrap:108 ../multistrap:120
 #, perl-format
 msgid "%s %s using %s\n"
 msgstr "%s %s dùng %s\n"
-#: ../multistrap:124 ../multistrap:128
+#: ../multistrap:126 ../multistrap:130
 #, perl-format
 msgid "Defaulting architecture to native: %s\n"
 msgstr "Mặc định là sử dụng kiến trúc sở hữu : %s\n"
-#: ../multistrap:132
+#: ../multistrap:134
 #, perl-format
 msgid "Using foreign architecture: %s\n"
 msgstr "Dùng kiến trúc ngoài: %s\n"
-#: ../multistrap:138
+#: ../multistrap:140
 #, perl-format
 msgid ""
 "No sources defined for a foreign multistrap.\n"
@ -54,26 +54,26 @@ msgstr ""
 "\tdùng cú pháp « aptsources= »."
 #. Translators: fields are: programname, architecture, host architecture.
-#: ../multistrap:146
+#: ../multistrap:148
 #, perl-format
 msgid "%s building %s multistrap on '%s'\n"
 msgstr "%s đang xây dựng multistrap %s trên « %s »\n"
-#: ../multistrap:168
+#: ../multistrap:170
 #, perl-format
 msgid "Unable to create directory '%s'\n"
 msgstr "Không thể tạo thư mục « %s »\n"
-#: ../multistrap:204
+#: ../multistrap:206
 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr ""
 "INF: ./lib64 -> liên kết tượng trưng « /lib » được đặt lại thành « ./lib ».\n"
-#: ../multistrap:214
+#: ../multistrap:216
 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n"
 msgstr "TIN: Đang đặt liên kết tượng trưng « ./lib64 » -> « ./lib ».\n"
-#: ../multistrap:254 ../multistrap:261 ../multistrap:391 ../multistrap:398
+#: ../multistrap:256 ../multistrap:263 ../multistrap:395 ../multistrap:402
 msgid "Cannot open sources list"
 msgstr "Không mở được danh sách nguồn"
@ -93,28 +93,28 @@ msgstr "Đang lấy các danh sách gói: apt-get %s update\n"
 msgid "apt update failed. Exit value: %d\n"
 msgstr "Tiến trình « apt update » (cập nhật) bị lỗi. Giá trị thoát: %d\n"
-#: ../multistrap:350
+#: ../multistrap:354
 #, perl-format
 msgid "apt download failed. Exit value: %d\n"
 msgstr "Tiến trình « apt download » (tải về) bị lỗi. Giá trị thoát: %d\n"
-#: ../multistrap:363
+#: ../multistrap:367
 msgid "ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n"
 msgstr ""
 "LỖI: Liên kết tượng trưng « ./lib64 » -> « /lib » bị đặt lại thành « ./lib » "
 "sau khi mở gói.\n"
-#: ../multistrap:364
+#: ../multistrap:368
 #, perl-format
 msgid "ERR: Some files may have been unpacked outside %s!\n"
 msgstr "LỖI: Một số tập tin nào đó có thể bị mở gói bên ngoài %s !\n"
-#: ../multistrap:371
+#: ../multistrap:375
 #, fuzzy
 msgid "Cannot read apt sources list directory.\n"
 msgstr "Không đọc được thư mục danh sách apt.\n"
-#: ../multistrap:414
+#: ../multistrap:416
 #, fuzzy, perl-format
 msgid ""
 "\n"
@ -124,21 +124,21 @@ msgstr ""
 "Hệ thống multistrap đã được cài đặt vào %s.\n"
 "\n"
-#: ../multistrap:417
+#: ../multistrap:419
 #, perl-format
 msgid ""
 "\n"
 "Compressing multistrap system in '%s' to a tarball called: '%s'.\n"
 msgstr ""
-#: ../multistrap:424
+#: ../multistrap:426
 #, perl-format
 msgid ""
 "\n"
 "Removing build directory: '%s'\n"
 msgstr ""
-#: ../multistrap:429
+#: ../multistrap:431
 #, fuzzy, perl-format
 msgid ""
 "\n"
@ -148,30 +148,30 @@ msgstr ""
 "Hệ thống multistrap đã được cài đặt vào %s.\n"
 "\n"
-#: ../multistrap:458 ../multistrap:509 ../multistrap:672
+#: ../multistrap:460 ../multistrap:511 ../multistrap:674
 msgid "Cannot read apt archives directory.\n"
 msgstr "Không đọc được thư mục kho lưu apt.\n"
-#: ../multistrap:475
+#: ../multistrap:477
 msgid "I: Calculating obsolete packages\n"
 msgstr "TIN: Đang tính các gói cũ\n"
-#: ../multistrap:492 ../multistrap:498
+#: ../multistrap:494 ../multistrap:500
 #, perl-format
 msgid "I: Removing %s\n"
 msgstr "TIN: Đang gỡ bỏ %s\n"
-#: ../multistrap:516
+#: ../multistrap:518
 #, perl-format
 msgid "Using directory %s for unpacking operations\n"
 msgstr "Đang sử dụng thư mục %s cho thao tác giải nén\n"
-#: ../multistrap:519
+#: ../multistrap:521
 #, perl-format
 msgid "I: Extracting %s...\n"
 msgstr "TIN: Đang giải nén %s...\n"
-#: ../multistrap:532
+#: ../multistrap:534
 #, perl-format
 msgid ""
 "dpkg -X failed with error code %s\n"
@ -180,55 +180,55 @@ msgstr ""
 "« dpkg -X » bị lỗi với mã lỗi %s\n"
 "Đang bỏ qua...\n"
-#: ../multistrap:572
+#: ../multistrap:574
 #, perl-format
 msgid " -> Processing conffiles for %s\n"
 msgstr " -> Đang xử lý các tập tin cấu hình cho %s\n"
-#: ../multistrap:593
+#: ../multistrap:595
 #, perl-format
 msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n"
 msgstr "LỖI: Liên kết tượng trưng « /lib64 » -> « ./lib » bị ghi đè bởi %s\n"
-#: ../multistrap:596
+#: ../multistrap:598
 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr ""
 "TIN: Liên kết tượng trưng « /lib64 » -> « /lib » được đặt lại thành « ./lib ».\n"
-#: ../multistrap:603
+#: ../multistrap:605
 msgid "I: Unpacking complete.\n"
 msgstr "TIN: Hoàn tất mở gói.\n"
-#: ../multistrap:618
+#: ../multistrap:620
 msgid "ERR: ./bin/sh symbolic link does not exist.\n"
 msgstr "LỖI: Liên kết tượng trưng « ./bin/sh » không tồn tại.\n"
-#: ../multistrap:621
+#: ../multistrap:623
 msgid "INF: Setting ./bin/sh -> ./bin/dash\n"
 msgstr "TIN: Đang đặt liên kết tượng trưng « ./bin/sh -> ./bin/dash »\n"
-#: ../multistrap:628
+#: ../multistrap:630
 msgid "INF: ./bin/dash not found. Setting ./bin/sh -> ./bin/bash\n"
 msgstr ""
 "TIN: Không tìm thấy « ./bin/dash ». Đang đặt « ./bin/sh -> ./bin/bash »\n"
-#: ../multistrap:647
+#: ../multistrap:649
 msgid "I: Tidying up apt cache and list data.\n"
 msgstr "TIN: Đang làm sạch vùng nhớ tạm và dữ liệu danh sách của apt.\n"
-#: ../multistrap:651
+#: ../multistrap:653
 msgid "Cannot read apt lists directory.\n"
 msgstr "Không đọc được thư mục danh sách apt.\n"
-#: ../multistrap:660
+#: ../multistrap:662
 msgid "Cannot read apt cache directory.\n"
 msgstr "Không đọc được thư mục nhớ tạm apt.\n"
-#: ../multistrap:690
+#: ../multistrap:693
 msgid "I: Native mode - configuring unpacked packages . . .\n"
 msgstr "TIN: Chế độ sở hữu — cấu hình các gói chưa mở . . .\n"
-#: ../multistrap:697
+#: ../multistrap:700
 #, perl-format
 msgid ""
 "I: dpkg configuration settings:\n"
@ -237,31 +237,31 @@ msgstr ""
 "TIN: Thiết lập cấu hình dpkg:\n"
 "\t%s\n"
-#: ../multistrap:704
+#: ../multistrap:707
 msgid "I: Running preinst scripts with 'upgrade' argument.\n"
 msgstr ""
-#: ../multistrap:730
+#: ../multistrap:733
 #, perl-format
 msgid "Cannot open %s directory. %s\n"
 msgstr "Không mở được thư mục %s. %s\n"
-#: ../multistrap:761
+#: ../multistrap:764
 #, perl-format
 msgid "cannot open apt sources list. %s"
 msgstr "không mở được danh sách nguồn apt. %s"
-#: ../multistrap:767
+#: ../multistrap:770
 #, perl-format
 msgid "cannot open apt sources.list directory %s\n"
 msgstr "không mở được thư mục danh sách nguồn « apt sources.list » %s\n"
-#: ../multistrap:772
+#: ../multistrap:775
 #, perl-format
 msgid "cannot open /etc/apt/sources.list.d/%s %s"
 msgstr "không mở được /etc/apt/sources.list.d/%s %s"
-#: ../multistrap:784
+#: ../multistrap:787
 #, fuzzy, perl-format
 msgid ""
 "\n"
@ -399,26 +399,112 @@ msgstr ""
 "Nó không phải được đóng gói thành một .tgz một khi hoàn tất.\n"
 "\n"
-#: ../multistrap:850
+#: ../multistrap:853
 msgid "failed to write usage:"
 msgstr "lỗi ghi cách sử dụng:"
-#: ../multistrap:950
+#: ../multistrap:961
 #, perl-format
 msgid ""
 "ERROR: Your version of apt is too old to support using a codename like '%s'. "
 "You MUST use the suite and multistrap is unable to guess which one you meant "
 "because suites change over time. Use one of: 'oldstable', 'stable', 'stable-"
 "proposed-updates', 'testing', 'unstable' or 'experimental'. Alternatively, "
 "upgrade to version of apt newer than 0.7.20.2+lenny1.\n"
 msgstr ""
 #: ../multistrap:982
 #, perl-format
 msgid "The supplied configuration file '%s' cannot be parsed correctly."
 msgstr ""
-#: ../multistrap:964
+#. Translators: followed by a list of section names from the config file.
 #: ../multistrap:987
 msgid "Sections specifying packages for downloading in the bootstrap: "
 msgstr ""
 #. Translators: followed by a list of section names from the config file.
 #: ../multistrap:989
 msgid "Sections specifying apt sources in the final system: "
 msgstr ""
 #: ../multistrap:998
 #, perl-format
 msgid "ERROR: The '%s' section is not defined.\n"
 msgstr ""
-#: ../multistrap:979
+#: ../multistrap:1002
 #, fuzzy
 msgid "Including configuration file from: "
 msgstr "Yêu cầu một tập tin cấu hình: dùng « %s -f »\n"
 #: ../multistrap:1004
 #, fuzzy
 msgid "No included configuration files.\n"
 msgstr "Yêu cầu một tập tin cấu hình: dùng « %s -f »\n"
 #: ../multistrap:1020
 msgid "Omit deb-src from sources.list for sections:"
 msgstr ""
 #: ../multistrap:1026
 msgid "Explicit suite selection: Yes\n"
 msgstr ""
 #: ../multistrap:1028
 msgid "Explicit suite selection: No - let apt use latest.\n"
 msgstr ""
 #: ../multistrap:1031
 msgid "Recommended packages are added to the selection.\n"
 msgstr ""
 #: ../multistrap:1033
 msgid "Recommended packages are ignored.\n"
 msgstr ""
 #: ../multistrap:1040
 #, fuzzy, perl-format
 msgid "arch:   \tArchitecture: %s\n"
 msgstr "Dùng kiến trúc ngoài: %s\n"
 #: ../multistrap:1042
 #, fuzzy, perl-format
 msgid "Cannot determine architecture from '%s'.\n"
 msgstr "Dùng kiến trúc ngoài: %s\n"
-#: ../multistrap:984
+#: ../multistrap:1045
 #, fuzzy, perl-format
 msgid "Output directory: '%s'\n"
 msgstr "Không thể tạo thư mục « %s »\n"
 #: ../multistrap:1047
 #, fuzzy, perl-format
 msgid "Cannot determine directory from '%s'.\n"
 msgstr "Không mở được thư mục %s. %s\n"
 #: ../multistrap:1049
 #, perl-format
 msgid "extract all downloaded archives: %s\n"
 msgstr ""
 #: ../multistrap:1054
 msgid "remove apt cache data: true\n"
 msgstr ""
 #: ../multistrap:1056
 msgid "remove apt cache data: false\n"
 msgstr ""
 #: ../multistrap:1059
 msgid "allow the use of unauthenticated repositories: true\n"
 msgstr ""
 #: ../multistrap:1061
 msgid "allow the use of unauthenticated repositories: false\n"
 msgstr ""
 #: ../multistrap:1064
 #, perl-format
 msgid "Sources will be retained in: %s\n"
 msgstr ""
--- a/pod/multistrap
+++ b/pod/multistrap
@ -54,8 +54,11 @@ Example configuration:
 noauth=false
 # extract all downloaded archives (default is true)
 unpack=true
 # whether to add the /suite to be explicit about where apt
 # needs to look for packages. Default is false.
 explicitsuite=false
 # aptsources is a list of sections to be used
- # the /etc/apt/sources.list.d/multistrap.sources.list      
+ # the /etc/apt/sources.list.d/multistrap.sources.list
 # of the target. Order is not important
 aptsources=Debian
 # the bootstrap option determines which repository
@ -112,9 +115,24 @@ configuration files should be C<bootstrap> instead.
 =head1 General settings:
 'arch' can be overridden on the command line using the C<--arch> option.
 'directory' specifies the top level directory where the bootstrap
 will be created - it is not packed into a .tgz once complete.
 'bootstrap' lists the Sections which will be used to specify the packages
 which will be downloaded (and optionally unpacked) into the bootstrap.
 'aptsources' lists the Sections which will be used to specify the apt
 sources in the final system, e.g. if you need to use a local repository
 to generate the rootfs which will not be available to the device at
 runtime, list that section in C<bootstrap> but not in C<aptsources>.
 If you want a package to be in the rootfs, it B<must> be specified in
 the C<bootstrap> list under General.
 The order of section names in either list is not important.
 As with debootstrap, multistrap will continue after errors, as long
 as the configuration file can be correctly parsed.
@ -131,6 +149,39 @@ file - this allows for backwards-compatible behaviour as well as
 overloading the multistrap config files to support other tools
 (like pbuilder).
 =head1 Section settings
 [Debian]
 packages=
 source=http://ftp.uk.debian.org/debian
 keyring=debian-archive-keyring
 suite=lenny
 The section name (in [] brackets) needs to be unique for this configuration
 file and any configuration files which this file includes. Section names
 are case insensitive (all comparisons happen after conversion to lower
 case).
 'packages' is the list of packages to be added when this Section
 is listed in C<bootstrap>.
 'source' is the apt source to use for this Section. (To use a local
 source on the same machine, ensure you use C<copy://> not C<file://>,
 so that apt is told to copy the packages into the rootfs instead of
 assuming it can try to download them later - because that "later" will
 never actually happen.
 'keyring' lists the package which contains the key used by the source
 listed in this Section. If no keyring is specified, the C<noauth>
 option must be set to B<true>. See Secure Apt.
 'suite' is the suite to use from this source. Note that this B<must>
 be the suite, not the codename.
 Suites change from time to time: (oldstable, stable, testing, sid)
 The codename (etch, lenny, squeeze, sid) does not change.
 =head1 Secure Apt
 To use authenticated apt repositories, multistrap either needs to be
@ -208,7 +259,7 @@ Debconf needs to be told to accept that user interaction is not
 desired:
 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
- 
+
 Perl needs to be told to accept that no locales are available inside
 the chroot and not to complain:
@ -318,12 +369,41 @@ rootfs. Only the packages specified manually in the configuration
 files will be used in the calculations - dependencies of those packages
 will be added but no others.
-=head1 Collecting packages from specific codenames/suites.
+=head1 Recommends behaviour
-Packages specified explicitly in the configuration sections will be
+The Debian default behaviour after the Lenny release was to consider
-passed to apt as package/codename so that the configuration controls
+recommended packages as extra packages to be installed when any one
-which version of a package is installed should the package exist in
+package is selected. Recommended packages are those which the maintainer
-two sources with different suites.
+considers that would be present on C<most> installations of that package
 and allowing Recommends means allowing Recommends of recommended packages
 and so on.
 The multistrap default is to turn recommends OFF.
 Set the allowrecommends option to true in the General section
 to use typical Debian behaviour.
 =head1 Explicit suite specification
 Sometimes, apt needs to be told to get a particular package from a
 particular suite, ignoring a more recent version in another suite
 in the same set of sources.
 C<multistrap> can operate with and without the explicit suite option,
 the default is to let apt use the most recent version from the collection
 of specified F<bootstrap> sources.
 Explicit suite specification has no effect on the final installed
 system - if your aptsources includes a repository which in turn includes
 a newer version of the package(s) specified explicitly, the next
 C<apt-get upgrade> on the device will bring in the newer version.
 Also, when specifying packages to get from a specific suite, apt will
 also try and ensure that the dependencies for that package are also
 from the same suite and this can cause apt to be unable to resolve the
 complete set of dependencies. In this situation, being explicit about
 one package selection may require being explicit about some (not
 necessarily all) of the dependencies of that package as well.
 When using this support in Lenny, ensure that each section uses the
 suite (oldstable, stable, testing, sid) and B<not> the codename
@ -338,9 +418,22 @@ Compare with
 $ sudo apt-get install apt/lenny
-=head1 Recommends TOIMPLEMENT:
+=cut
-Default recommends OFF
+=head1 Omitting deb-src listings
-option to set it as on.
+
 Some multistrap environments do not need access to the Debian sources
 of packages being installed, typically this is required when preparing
 a build (or cross-build) chroot using multistrap.
 To turn off this additional source (and save both download time and
 apt-cache size), use the omitdebsrc field in each Section.
 [Baked]
 packages=
 source=http://www.emdebian.org/baked
 keyring=emdebian-archive-keyring
 suite=testing
 omitdebsrc=true
 =cut