Document the reinstall and additional fields. Add advice in manpage on what to check before filing bugs.

git-svn-id: http://emdebian.org/svn/current@7562 563faec7-e20c-0410-992a-a66f704d0ccd

debian/changelog

@@ -14,8 +14,10 @@ multistrap (2.1.8) experimental; urgency=low
   * Drop all use of forceyes - no longer necessary.
   * Handle missing 'include' files cleanly and early. (Closes: #595006)
   * Expand the --simulate option output further.
+  * Document the reinstall and additional fields. Add advice in manpage
+    on what to check before filing bugs.
 
- -- Neil Williams <codehelp@debian.org>  Sat, 16 Oct 2010 12:36:32 +0100
+ -- Neil Williams <codehelp@debian.org>  Sat, 16 Oct 2010 12:37:25 +0100
 
 multistrap (2.1.7) unstable; urgency=low
 

doc/po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: multistrap 2.1.6\n"
 "Report-Msgid-Bugs-To: codehelp@debian.org\n"
-"POT-Creation-Date: 2010-10-03 19:23+0200\n"
+"POT-Creation-Date: 2010-10-16 12:34+0200\n"
 "PO-Revision-Date: 2010-09-07 21:30+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1328,6 +1328,91 @@ msgstr ""
 "Installation des Pakets »keyring« auf dem Host-System ebenfalls "
 "übersprungen, falls Fakeroot erkannt wird."
 
+#. type: =head1
+#: pod/multistrap:484
+msgid "Handling problematic packages"
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:486
+msgid ""
+"Sometimes, a particular package will fail to even unpack properly if other "
+"packages have not already been unpacked. This can happen if dpkg diversions "
+"are not setup correctly or if the package Pre-Depends on an executable in "
+"another package."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:491
+msgid ""
+"Multistrap offers two ways to handle these problems. A package can be listed "
+"as C<reinstall> or as C<additional>. Each section in the C<multistrap> "
+"configuration file can have a single C<reinstall> or C<additional> listing "
+"or both."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:496
+msgid ""
+"Reinstall means that the package will be downloaded and unpacked as normal - "
+"alongside all the other packages, but will then be reinstalled at the end by "
+"running the C<preinst> maintainer script with the C<upgrade> argument. "
+"C<dpkg> will then continue the rest of the configuration of that package."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:502
+msgid ""
+"Additional adds a second round of C<apt-get install> to the multistrap "
+"process - after the initial unpacking. The additional package will then be "
+"downloaded and unpacked. If running natively, the additional package is "
+"downloaded, unpacked and configured after all the rest of the packages have "
+"been downloaded, unpacked and configured."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:508
+msgid ""
+"Neither C<reinstall> nor C<additional> should be seen as more than just "
+"workarounds and wishlist bugs should be filed in Debian against packages "
+"which require the use of these mechanisms (or the packages which would "
+"prevent the particular package from operating normally)."
+msgstr ""
+
+#. type: =head1
+#: pod/multistrap:515
+msgid "Bugs"
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:517
+msgid ""
+"As C<multistrap> gets more complex, bugs will creep into the package.  When "
+"reporting bugs against multistrap, B<please> attach all configuration files. "
+"If your configuration needs to access local or private apt repositories, "
+"please check your configuration with the latest version of C<multistrap> in "
+"Debian using the C<--simulate> option and include that report in your bug "
+"report."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:524
+msgid ""
+"The C<--simulate> option output is regularly expanded to help users debug "
+"problems in the configuration files."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:527
+msgid ""
+"Please also check (and update) the Multistrap wiki at http://wiki.debian.org/"
+"Multistrap and the Multistrap webpage content at http://www.emdebian.org/"
+"multistrap/ before filing bugs. Various people on the debian-embedded@lists."
+"debian.org mailing list and #emdebian IRC channel on irc.oftc.net can also "
+"help - if you can put the C<--simulate> output on a pastebin website and put "
+"the URL in your message."
+msgstr ""
+
 #. type: textblock
 #: device-table.pl:155
 msgid "device-table.pl - parses simple device tables and passes to mknod"

doc/po/fr.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: multistrap 2.1.4\n"
-"POT-Creation-Date: 2010-10-03 19:23+0200\n"
+"POT-Creation-Date: 2010-10-16 12:34+0200\n"
 "PO-Revision-Date: 2010-09-11 13:13+0100\n"
 "Last-Translator: Julien Patriarca <patriarcaj@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1326,6 +1326,91 @@ msgstr ""
 "paquet trousseau sur le système hôte est également sauté si fakeroot est "
 "détecté."
 
+#. type: =head1
+#: pod/multistrap:484
+msgid "Handling problematic packages"
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:486
+msgid ""
+"Sometimes, a particular package will fail to even unpack properly if other "
+"packages have not already been unpacked. This can happen if dpkg diversions "
+"are not setup correctly or if the package Pre-Depends on an executable in "
+"another package."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:491
+msgid ""
+"Multistrap offers two ways to handle these problems. A package can be listed "
+"as C<reinstall> or as C<additional>. Each section in the C<multistrap> "
+"configuration file can have a single C<reinstall> or C<additional> listing "
+"or both."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:496
+msgid ""
+"Reinstall means that the package will be downloaded and unpacked as normal - "
+"alongside all the other packages, but will then be reinstalled at the end by "
+"running the C<preinst> maintainer script with the C<upgrade> argument. "
+"C<dpkg> will then continue the rest of the configuration of that package."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:502
+msgid ""
+"Additional adds a second round of C<apt-get install> to the multistrap "
+"process - after the initial unpacking. The additional package will then be "
+"downloaded and unpacked. If running natively, the additional package is "
+"downloaded, unpacked and configured after all the rest of the packages have "
+"been downloaded, unpacked and configured."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:508
+msgid ""
+"Neither C<reinstall> nor C<additional> should be seen as more than just "
+"workarounds and wishlist bugs should be filed in Debian against packages "
+"which require the use of these mechanisms (or the packages which would "
+"prevent the particular package from operating normally)."
+msgstr ""
+
+#. type: =head1
+#: pod/multistrap:515
+msgid "Bugs"
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:517
+msgid ""
+"As C<multistrap> gets more complex, bugs will creep into the package.  When "
+"reporting bugs against multistrap, B<please> attach all configuration files. "
+"If your configuration needs to access local or private apt repositories, "
+"please check your configuration with the latest version of C<multistrap> in "
+"Debian using the C<--simulate> option and include that report in your bug "
+"report."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:524
+msgid ""
+"The C<--simulate> option output is regularly expanded to help users debug "
+"problems in the configuration files."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:527
+msgid ""
+"Please also check (and update) the Multistrap wiki at http://wiki.debian.org/"
+"Multistrap and the Multistrap webpage content at http://www.emdebian.org/"
+"multistrap/ before filing bugs. Various people on the debian-embedded@lists."
+"debian.org mailing list and #emdebian IRC channel on irc.oftc.net can also "
+"help - if you can put the C<--simulate> output on a pastebin website and put "
+"the URL in your message."
+msgstr ""
+
 #. type: textblock
 #: device-table.pl:155
 msgid "device-table.pl - parses simple device tables and passes to mknod"

doc/po/pt.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: multistrap 2.1.7\n"
-"POT-Creation-Date: 2010-10-03 19:23+0200\n"
+"POT-Creation-Date: 2010-10-16 12:34+0200\n"
 "PO-Revision-Date: 2010-09-02 22:47+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1297,6 +1297,91 @@ msgstr ""
 "pacote chaveiro no sistema anfitrião é também saltado se for detectado o "
 "fakeroot."
 
+#. type: =head1
+#: pod/multistrap:484
+msgid "Handling problematic packages"
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:486
+msgid ""
+"Sometimes, a particular package will fail to even unpack properly if other "
+"packages have not already been unpacked. This can happen if dpkg diversions "
+"are not setup correctly or if the package Pre-Depends on an executable in "
+"another package."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:491
+msgid ""
+"Multistrap offers two ways to handle these problems. A package can be listed "
+"as C<reinstall> or as C<additional>. Each section in the C<multistrap> "
+"configuration file can have a single C<reinstall> or C<additional> listing "
+"or both."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:496
+msgid ""
+"Reinstall means that the package will be downloaded and unpacked as normal - "
+"alongside all the other packages, but will then be reinstalled at the end by "
+"running the C<preinst> maintainer script with the C<upgrade> argument. "
+"C<dpkg> will then continue the rest of the configuration of that package."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:502
+msgid ""
+"Additional adds a second round of C<apt-get install> to the multistrap "
+"process - after the initial unpacking. The additional package will then be "
+"downloaded and unpacked. If running natively, the additional package is "
+"downloaded, unpacked and configured after all the rest of the packages have "
+"been downloaded, unpacked and configured."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:508
+msgid ""
+"Neither C<reinstall> nor C<additional> should be seen as more than just "
+"workarounds and wishlist bugs should be filed in Debian against packages "
+"which require the use of these mechanisms (or the packages which would "
+"prevent the particular package from operating normally)."
+msgstr ""
+
+#. type: =head1
+#: pod/multistrap:515
+msgid "Bugs"
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:517
+msgid ""
+"As C<multistrap> gets more complex, bugs will creep into the package.  When "
+"reporting bugs against multistrap, B<please> attach all configuration files. "
+"If your configuration needs to access local or private apt repositories, "
+"please check your configuration with the latest version of C<multistrap> in "
+"Debian using the C<--simulate> option and include that report in your bug "
+"report."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:524
+msgid ""
+"The C<--simulate> option output is regularly expanded to help users debug "
+"problems in the configuration files."
+msgstr ""
+
+#. type: textblock
+#: pod/multistrap:527
+msgid ""
+"Please also check (and update) the Multistrap wiki at http://wiki.debian.org/"
+"Multistrap and the Multistrap webpage content at http://www.emdebian.org/"
+"multistrap/ before filing bugs. Various people on the debian-embedded@lists."
+"debian.org mailing list and #emdebian IRC channel on irc.oftc.net can also "
+"help - if you can put the C<--simulate> output on a pastebin website and put "
+"the URL in your message."
+msgstr ""
+
 #. type: textblock
 #: device-table.pl:155
 msgid "device-table.pl - parses simple device tables and passes to mknod"

po/da.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: multistrap\n"
 "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n"
-"POT-Creation-Date: 2010-10-03 19:53+0100\n"
+"POT-Creation-Date: 2010-10-16 12:35+0100\n"
 "PO-Revision-Date: 2010-09-03 17:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
@@ -28,28 +28,23 @@ msgid "Need a configuration file - use %s -f\n"
 msgstr "Kræver en konfigurationsfil - brug %s -f\n"
 
 #. Translators: fields are programname, version string, include file.
-#: ../multistrap:98
-#, fuzzy, perl-format
-msgid "%s %s including %s\n"
-msgstr "%s %s ved brug af %s\n"
-
 #. Translators: fields are: programname, versionstring, configfile.
-#: ../multistrap:119
+#: ../multistrap:97 ../multistrap:120
 #, perl-format
 msgid "%s %s using %s\n"
 msgstr "%s %s ved brug af %s\n"
 
-#: ../multistrap:124 ../multistrap:126
+#: ../multistrap:125 ../multistrap:127
 #, perl-format
 msgid "Defaulting architecture to native: %s\n"
 msgstr "Falder tilbage på oprindelig arkitektur: %s\n"
 
-#: ../multistrap:128
+#: ../multistrap:129
 #, perl-format
 msgid "Using foreign architecture: %s\n"
 msgstr "Bruger fremmed arkitektur: %s\n"
 
-#: ../multistrap:133
+#: ../multistrap:134
 #, perl-format
 msgid ""
 "No sources defined for a foreign multistrap.\n"
@@ -61,76 +56,76 @@ msgstr ""
 "\tvis dem med aptsources= i '%s'."
 
 #. Translators: fields are: programname, architecture, host architecture.
-#: ../multistrap:141
+#: ../multistrap:142
 #, perl-format
 msgid "%s building %s multistrap on '%s'\n"
 msgstr "%s bygger %s multistrap på '%s'\n"
 
-#: ../multistrap:143
+#: ../multistrap:144
 msgid "No directory specified!"
 msgstr ""
 
-#: ../multistrap:149
+#: ../multistrap:150
 #, perl-format
 msgid "Unable to create directory '%s'"
 msgstr "Kunne ikke oprette mappe '%s'"
 
-#: ../multistrap:200
+#: ../multistrap:201
 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr "INF: ./lib64 -> /lib symbolsk henvisning nulstil til ./lib.\n"
 
-#: ../multistrap:208
+#: ../multistrap:209
 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n"
 msgstr "INF: Setting ./lib64 -> ./lib symbolic link.\n"
 
-#: ../multistrap:237 ../multistrap:242 ../multistrap:381 ../multistrap:386
+#: ../multistrap:238 ../multistrap:243 ../multistrap:389 ../multistrap:394
 msgid "Cannot open sources list"
 msgstr "Kan ikke åbne kildeliste"
 
-#: ../multistrap:261
+#: ../multistrap:262
 #, perl-format
 msgid "I: Installing %s\n"
 msgstr "I: Installerer %s\n"
 
-#: ../multistrap:269
+#: ../multistrap:277
 #, perl-format
 msgid "Unable to download keyring package: '%s'"
 msgstr ""
 
-#: ../multistrap:307
+#: ../multistrap:315
 #, perl-format
 msgid "Getting package lists: apt-get %s update\n"
 msgstr "Henter pakkelister: apt-get %s opdater\n"
 
-#: ../multistrap:309
+#: ../multistrap:317
 #, perl-format
 msgid "apt update failed. Exit value: %d\n"
 msgstr "apt update mislykkedes. Afslutningsværdi: %d\n"
 
-#: ../multistrap:314
+#: ../multistrap:322
 msgid "I: Calculating required packages.\n"
 msgstr "I: Kalkulerer krævede pakker.\n"
 
-#: ../multistrap:350
+#: ../multistrap:358
 #, perl-format
 msgid "apt download failed. Exit value: %d\n"
 msgstr "apt-hentning mislykkedes. Afslutningsværdi: %d\n"
 
-#: ../multistrap:363
+#: ../multistrap:371
 msgid "ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n"
 msgstr ""
 "ERR: ./lib64 -> /lib symbolsk henvisning nulstil til ./lib efter udpakning.\n"
 
-#: ../multistrap:364
+#: ../multistrap:372
 #, 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:371
+#: ../multistrap:379
 msgid "Cannot read apt sources list directory.\n"
 msgstr "Kan ikke læse apt-kildernes listemappe.\n"
 
-#: ../multistrap:400
+#: ../multistrap:408
 #, perl-format
 msgid ""
 "\n"
@@ -139,7 +134,7 @@ msgstr ""
 "\n"
 "Multistrap system installeret i %s.\n"
 
-#: ../multistrap:402
+#: ../multistrap:410
 #, perl-format
 msgid ""
 "\n"
@@ -148,7 +143,7 @@ msgstr ""
 "\n"
 "Pakker multistrap system i '%s' til en tarball kaldt: '%s'.\n"
 
-#: ../multistrap:408
+#: ../multistrap:416
 #, perl-format
 msgid ""
 "\n"
@@ -157,7 +152,7 @@ msgstr ""
 "\n"
 "Fjerner kompileringsmappe: '%s'\n"
 
-#: ../multistrap:413
+#: ../multistrap:421
 #, perl-format
 msgid ""
 "\n"
@@ -166,30 +161,30 @@ msgstr ""
 "\n"
 "Multistrap system pakket som '%s'.\n"
 
-#: ../multistrap:439 ../multistrap:480 ../multistrap:633
+#: ../multistrap:447 ../multistrap:488 ../multistrap:641
 msgid "Cannot read apt archives directory.\n"
 msgstr "Kan ikke læse apt-arkivets mappe.\n"
 
-#: ../multistrap:452
+#: ../multistrap:460
 msgid "I: Calculating obsolete packages\n"
 msgstr "I: Kalkulerer forældede pakker\n"
 
-#: ../multistrap:466 ../multistrap:470
+#: ../multistrap:474 ../multistrap:478
 #, perl-format
 msgid "I: Removing %s\n"
 msgstr "I: Fjerner %s\n"
 
-#: ../multistrap:487
+#: ../multistrap:495
 #, perl-format
 msgid "Using directory %s for unpacking operations\n"
 msgstr "Bruger mappe %s til udpakningshandlinger\n"
 
-#: ../multistrap:489
+#: ../multistrap:497
 #, perl-format
 msgid "I: Extracting %s...\n"
 msgstr "I: Udpakker %s...\n"
 
-#: ../multistrap:502
+#: ../multistrap:510
 #, perl-format
 msgid ""
 "dpkg -X failed with error code %s\n"
@@ -198,49 +193,49 @@ msgstr ""
 "dpkg -X mislykkedes med fejlkode %s\n"
 "Springer over...\n"
 
-#: ../multistrap:538
+#: ../multistrap:546
 #, perl-format
 msgid " -> Processing conffiles for %s\n"
 msgstr " -> Behandler conffiler for %s\n"
 
-#: ../multistrap:557
+#: ../multistrap:565
 #, perl-format
 msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n"
 msgstr "ERR: lib64 -> ./lib symbolsk henvisning knust af %s\n"
 
-#: ../multistrap:560
+#: ../multistrap:568
 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr "INF: lib64 -> /lib symbolsk henvisning nulstil til ./lib.\n"
 
-#: ../multistrap:567
+#: ../multistrap:575
 msgid "I: Unpacking complete.\n"
 msgstr "I: Udpakning færdig.\n"
 
-#: ../multistrap:580
+#: ../multistrap:588
 msgid "ERR: ./bin/sh symbolic link does not exist.\n"
 msgstr "ERR: ./bin/sh symbolsk henvisning eksisterer ikke.\n"
 
-#: ../multistrap:582
+#: ../multistrap:590
 msgid "INF: Setting ./bin/sh -> ./bin/dash\n"
 msgstr "INF: Indstiller ./bin/sh -> ./bin/dash\n"
 
-#: ../multistrap:587
+#: ../multistrap:595
 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:602
+#: ../multistrap:610
 msgid "I: Tidying up apt cache and list data.\n"
 msgstr "I: Rydder op i apt-mellemlager og listedata.\n"
 
-#: ../multistrap:615
+#: ../multistrap:623
 msgid "Cannot read apt lists directory.\n"
 msgstr "Kan ikke læse apt-listemapper.\n"
 
-#: ../multistrap:623
+#: ../multistrap:631
 msgid "Cannot read apt cache directory.\n"
 msgstr "Kan ikke læse apt-mellemlagermappe.\n"
 
-#: ../multistrap:655
+#: ../multistrap:663
 #, perl-format
 msgid ""
 "I: dpkg configuration settings:\n"
@@ -249,7 +244,7 @@ msgstr ""
 "I: Opsætning af dpkg-konfiguration:\n"
 "\t%s\n"
 
-#: ../multistrap:657
+#: ../multistrap:665
 msgid ""
 "W: Cannot use 'chroot' when fakeroot is in use. Skipping package "
 "configuration.\n"
@@ -257,35 +252,35 @@ msgstr ""
 "W: Kan ikke bruge 'chroot' når fakeroot er i brug. Springer "
 "pakkekonfiguration over.\n"
 
-#: ../multistrap:660
+#: ../multistrap:668
 msgid "I: Native mode - configuring unpacked packages . . .\n"
 msgstr "I: Standardtilstand - konfigurerer upakkede pakker...\n"
 
-#: ../multistrap:671
+#: ../multistrap:679
 msgid "I: Running preinst scripts with 'upgrade' argument.\n"
 msgstr "I: Kører preinst-skripter med argumentet 'upgrade'.\n"
 
-#: ../multistrap:694
+#: ../multistrap:702
 #, perl-format
 msgid "Cannot open %s directory. %s\n"
 msgstr "Kan ikke åben mappen %s. %s\n"
 
-#: ../multistrap:725
+#: ../multistrap:733
 #, perl-format
 msgid "cannot open apt sources list. %s"
 msgstr "kan ikke åbne apt-kildeliste. %s"
 
-#: ../multistrap:731
+#: ../multistrap:739
 #, perl-format
 msgid "cannot open apt sources.list directory %s\n"
 msgstr "kan ikke åbne apt-sources-list-mappe %s\n"
 
-#: ../multistrap:736
+#: ../multistrap:744
 #, perl-format
 msgid "cannot open /etc/apt/sources.list.d/%s %s"
 msgstr "kan ikke åbne /etc/apt/sources.list.d/%s %s"
 
-#: ../multistrap:748
+#: ../multistrap:756
 #, fuzzy, perl-format
 msgid ""
 "\n"
@@ -421,16 +416,16 @@ msgstr ""
 "hvis den ikke pakkes ind i en .tgz når den først er færdig.\n"
 "\n"
 
-#: ../multistrap:814
+#: ../multistrap:822
 msgid "failed to write usage:"
 msgstr "kunne ikke skrive brug:"
 
-#: ../multistrap:871
+#: ../multistrap:880
 #, perl-format
 msgid "ERR: Cannot find include file: '%s' for '%s'"
 msgstr ""
 
-#: ../multistrap:912
+#: ../multistrap:926
 #, perl-format
 msgid ""
 "ERROR: Your version of apt is too old to support using a codename like '%s'. "
@@ -446,94 +441,140 @@ msgstr ""
 "'unstable' eller 'experimental'. Alternativt kan du opgradere til en version "
 "af apt, der er nyere end 0.7.20.2+lenny1.\n"
 
-#: ../multistrap:932
+#: ../multistrap:946
 #, perl-format
 msgid "The supplied configuration file '%s' cannot be parsed correctly."
 msgstr "Den angivne konfigurationsfil '%s' kan ikke fortolkes korrekt."
 
-#: ../multistrap:945
+#: ../multistrap:960
 #, perl-format
 msgid "ERR: The '%s' section is not defined.\n"
 msgstr "FEJL: Afsnittet '%s' er ikke defineret.\n"
 
-#: ../multistrap:949
+#: ../multistrap:964
+#, fuzzy
 msgid "Including configuration file from:"
-msgstr "Inklusiv konfigurationsfil fra: "
+msgid_plural "Including configuration files from:"
+msgstr[0] "Inklusiv konfigurationsfil fra: "
+msgstr[1] "Inklusiv konfigurationsfil fra: "
 
-#: ../multistrap:951
+#: ../multistrap:968
 msgid "No included configuration files.\n"
 msgstr "Ingen inkluderede konfigurationsfiler\n"
 
-#: ../multistrap:971 ../multistrap:972
+#: ../multistrap:988
-msgid "Sections"
+msgid "Not listed as a 'Bootstrap' section."
 msgstr ""
 
-#: ../multistrap:978
+#: ../multistrap:995
+msgid "Section to install"
+msgid_plural "Sections to install"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../multistrap:997
+msgid "Section for updates"
+msgid_plural "Sections for updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../multistrap:1004
 msgid "Omit deb-src from sources.list for sections:"
 msgstr "Udelad deb-src fra sources.list for afsnit:"
 
-#: ../multistrap:984
+#: ../multistrap:1006
+msgid "None."
+msgstr ""
+
+#: ../multistrap:1014
 msgid "Explicit suite selection: Yes\n"
 msgstr "Eksplicit programpakkevalg: Ja\n"
 
-#: ../multistrap:986
+#: ../multistrap:1016
 msgid "Explicit suite selection: No - let apt use latest.\n"
 msgstr "Eksplicit programvalg: Nej - lad apt bruge seneste.\n"
 
-#: ../multistrap:989
+#: ../multistrap:1019
 msgid "Recommended packages are added to the selection.\n"
 msgstr "Anbefalede pakker tilføjes til valget.\n"
 
-#: ../multistrap:991
+#: ../multistrap:1021
 msgid "Recommended packages are ignored.\n"
 msgstr "Anbefalede pakker ignoreres.\n"
 
-#: ../multistrap:998
+#: ../multistrap:1023
-#, perl-format
+msgid "Extra Package: "
-msgid "Architecture: %s\n"
+msgid_plural "Extra Packages: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../multistrap:1029
+#, fuzzy, perl-format
+msgid "Architecture to download: %s\n"
 msgstr "Arkitektur: %s\n"
 
-#: ../multistrap:1000
+#: ../multistrap:1031
 #, perl-format
 msgid "Cannot determine architecture from '%s'.\n"
 msgstr "Kan ikke bestemme arkitektur fra '%s'.\n"
 
-#: ../multistrap:1003
+#: ../multistrap:1034
 #, perl-format
 msgid "Output directory: '%s'\n"
 msgstr "Uddatamappe: '%s'\n"
 
-#: ../multistrap:1005
+#: ../multistrap:1036
 #, perl-format
 msgid "Cannot determine directory from '%s'.\n"
 msgstr "Kan ikke bestemme mappe fra '%s'.\n"
 
-#: ../multistrap:1007
+#: ../multistrap:1038
 #, perl-format
 msgid "extract all downloaded archives: %s\n"
 msgstr "udtræk alle hentede arkiver: %s\n"
 
-#: ../multistrap:1012
+#: ../multistrap:1040
+msgid "Script to be run after unpacking"
+msgstr ""
+
+#: ../multistrap:1042
+msgid "'Priority required' packages are not included."
+msgstr ""
+
+#: ../multistrap:1044
+msgid "'Priority: required' packages are included."
+msgstr ""
+
+#: ../multistrap:1047
 msgid "remove apt cache data: true\n"
 msgstr "fjern apt-mellemlagerdata: true\n"
 
-#: ../multistrap:1014
+#: ../multistrap:1049
 msgid "remove apt cache data: false\n"
 msgstr "fjern apt-mellemlagerdata: false\n"
 
-#: ../multistrap:1017
+#: ../multistrap:1052
 msgid "allow the use of unauthenticated repositories: true\n"
 msgstr "tillad brugen af arkiver der ikke er godkendte: true\n"
 
-#: ../multistrap:1019
+#: ../multistrap:1054
 msgid "allow the use of unauthenticated repositories: false\n"
 msgstr "tillad brugen af arkiver der ikke ikke er godkendte: false\n"
 
-#: ../multistrap:1022
+#: ../multistrap:1057
 #, perl-format
 msgid "Sources will be retained in: %s\n"
 msgstr "Kilder vil blive bevaret i: %s\n"
 
+#: ../multistrap:1060
+#, perl-format
+msgid "Tarball name: '%s'\n"
+msgstr ""
+
+#, fuzzy
+#~ msgid "%s %s including %s\n"
+#~ msgstr "%s %s ved brug af %s\n"
+
 #~ msgid "Unable to create directory '%s'\n"
 #~ msgstr "Kunne ikke oprette mappe '%s'\n"
 

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-10-03 19:53+0100\n"
+"POT-Creation-Date: 2010-10-16 12:35+0100\n"
 "PO-Revision-Date: 2010-09-26 21:07+0200\n"
 "Last-Translator: Julien Patriarca <patriarcaj@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -29,28 +29,23 @@ msgstr ""
 "la commande %s -f\n"
 
 #. Translators: fields are programname, version string, include file.
-#: ../multistrap:98
-#, fuzzy, perl-format
-msgid "%s %s including %s\n"
-msgstr "%s %s utilise %s\n"
-
 #. Translators: fields are: programname, versionstring, configfile.
-#: ../multistrap:119
+#: ../multistrap:97 ../multistrap:120
 #, perl-format
 msgid "%s %s using %s\n"
 msgstr "%s %s utilise %s\n"
 
-#: ../multistrap:124 ../multistrap:126
+#: ../multistrap:125 ../multistrap:127
 #, perl-format
 msgid "Defaulting architecture to native: %s\n"
 msgstr "Utilisation de l'architecture native %s\n"
 
-#: ../multistrap:128
+#: ../multistrap:129
 #, perl-format
 msgid "Using foreign architecture: %s\n"
 msgstr "Utilisation de l'architecture %s\n"
 
-#: ../multistrap:133
+#: ../multistrap:134
 #, perl-format
 msgid ""
 "No sources defined for a foreign multistrap.\n"
@@ -62,78 +57,78 @@ msgstr ""
 "\tsources différentes, listez les avec aptsources= dans « %s »."
 
 #. Translators: fields are: programname, architecture, host architecture.
-#: ../multistrap:141
+#: ../multistrap:142
 #, perl-format
 msgid "%s building %s multistrap on '%s'\n"
 msgstr "%s construit un multistrap pour l'architecture « %s » sur « %s »\n"
 
-#: ../multistrap:143
+#: ../multistrap:144
 msgid "No directory specified!"
 msgstr ""
 
-#: ../multistrap:149
+#: ../multistrap:150
 #, perl-format
 msgid "Unable to create directory '%s'"
 msgstr "Impossible de créer le répertoire « %s »"
 
-#: ../multistrap:200
+#: ../multistrap:201
 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr ""
 "INF : le lien symbolique ./lib64 -> /lib pointe maintenant vers ./lib.\n"
 
-#: ../multistrap:208
+#: ../multistrap:209
 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n"
 msgstr "INF : définition du lien symbolique ./lib64 -> ./lib.\n"
 
-#: ../multistrap:237 ../multistrap:242 ../multistrap:381 ../multistrap:386
+#: ../multistrap:238 ../multistrap:243 ../multistrap:389 ../multistrap:394
 msgid "Cannot open sources list"
 msgstr "Impossible d'ouvrir la liste des sources"
 
-#: ../multistrap:261
+#: ../multistrap:262
 #, perl-format
 msgid "I: Installing %s\n"
 msgstr "I : installation de %s\n"
 
-#: ../multistrap:269
+#: ../multistrap:277
 #, perl-format
 msgid "Unable to download keyring package: '%s'"
 msgstr ""
 
-#: ../multistrap:307
+#: ../multistrap:315
 #, 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:309
+#: ../multistrap:317
 #, perl-format
 msgid "apt update failed. Exit value: %d\n"
 msgstr "Échec de la mise à jour apt. Code de sortie : %d\n"
 
-#: ../multistrap:314
+#: ../multistrap:322
 msgid "I: Calculating required packages.\n"
 msgstr "I : prise en compte des paquets requis.\n"
 
-#: ../multistrap:350
+#: ../multistrap:358
 #, perl-format
 msgid "apt download failed. Exit value: %d\n"
 msgstr "Échec du téléchargement apt. Code de sortie : %d\n"
 
-#: ../multistrap:363
+#: ../multistrap:371
 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"
 
-#: ../multistrap:364
+#: ../multistrap:372
 #, 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:371
+#: ../multistrap:379
 msgid "Cannot read apt sources list directory.\n"
 msgstr "Impossible de lire le répertoire des sources d'apt.\n"
 
-#: ../multistrap:400
+#: ../multistrap:408
 #, perl-format
 msgid ""
 "\n"
@@ -142,7 +137,7 @@ msgstr ""
 "\n"
 "Système multistrap installé avec succès dans %s.\n"
 
-#: ../multistrap:402
+#: ../multistrap:410
 #, perl-format
 msgid ""
 "\n"
@@ -152,7 +147,7 @@ msgstr ""
 "Compression du système multistrap se trouvant dans « %s » dans une archive "
 "tar nommée : « %s ».\n"
 
-#: ../multistrap:408
+#: ../multistrap:416
 #, perl-format
 msgid ""
 "\n"
@@ -161,7 +156,7 @@ msgstr ""
 "\n"
 "Suppression du répertoire de compilation : « %s »\n"
 
-#: ../multistrap:413
+#: ../multistrap:421
 #, perl-format
 msgid ""
 "\n"
@@ -170,30 +165,30 @@ msgstr ""
 "\n"
 "Système multistrap empaqueté avec succès dans « %s ».\n"
 
-#: ../multistrap:439 ../multistrap:480 ../multistrap:633
+#: ../multistrap:447 ../multistrap:488 ../multistrap:641
 msgid "Cannot read apt archives directory.\n"
 msgstr "Impossible d'accéder au répertoire des archives apt.\n"
 
-#: ../multistrap:452
+#: ../multistrap:460
 msgid "I: Calculating obsolete packages\n"
 msgstr "I : identification des paquets obsolètes\n"
 
-#: ../multistrap:466 ../multistrap:470
+#: ../multistrap:474 ../multistrap:478
 #, perl-format
 msgid "I: Removing %s\n"
 msgstr "I : suppression de %s\n"
 
-#: ../multistrap:487
+#: ../multistrap:495
 #, 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:489
+#: ../multistrap:497
 #, perl-format
 msgid "I: Extracting %s...\n"
 msgstr "I : extraction de %s...\n"
 
-#: ../multistrap:502
+#: ../multistrap:510
 #, perl-format
 msgid ""
 "dpkg -X failed with error code %s\n"
@@ -202,51 +197,51 @@ msgstr ""
 "dpkg -X a échoué avec le code d'erreur %s\n"
 "Annulation...\n"
 
-#: ../multistrap:538
+#: ../multistrap:546
 #, perl-format
 msgid " -> Processing conffiles for %s\n"
 msgstr " -> Traitement des fichiers de configuration pour %s\n"
 
-#: ../multistrap:557
+#: ../multistrap:565
 #, 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:560
+#: ../multistrap:568
 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr "INF : le lien symbolique lib64 -> /lib pointe maintenant vers ./lib.\n"
 
-#: ../multistrap:567
+#: ../multistrap:575
 msgid "I: Unpacking complete.\n"
 msgstr "I : dépaquetage terminé.\n"
 
-#: ../multistrap:580
+#: ../multistrap:588
 msgid "ERR: ./bin/sh symbolic link does not exist.\n"
 msgstr "ERR : le lien symbolique ./bin/sh n'existe pas.\n"
 
-#: ../multistrap:582
+#: ../multistrap:590
 msgid "INF: Setting ./bin/sh -> ./bin/dash\n"
 msgstr "INF : définition du lien symbolique ./bin/sh -> ./bin/dash\n"
 
-#: ../multistrap:587
+#: ../multistrap:595
 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"
 
-#: ../multistrap:602
+#: ../multistrap:610
 msgid "I: Tidying up apt cache and list data.\n"
 msgstr "I : nettoyage du cache apt et des listes de données.\n"
 
-#: ../multistrap:615
+#: ../multistrap:623
 msgid "Cannot read apt lists directory.\n"
 msgstr "Impossible d'accéder au répertoire des listes apt.\n"
 
-#: ../multistrap:623
+#: ../multistrap:631
 msgid "Cannot read apt cache directory.\n"
 msgstr "Impossible d'accéder au répertoire du cache apt.\n"
 
-#: ../multistrap:655
+#: ../multistrap:663
 #, perl-format
 msgid ""
 "I: dpkg configuration settings:\n"
@@ -255,7 +250,7 @@ msgstr ""
 "I : paramètres de configuration de dpkg :\n"
 "\t%s\n"
 
-#: ../multistrap:657
+#: ../multistrap:665
 msgid ""
 "W: Cannot use 'chroot' when fakeroot is in use. Skipping package "
 "configuration.\n"
@@ -265,37 +260,37 @@ msgstr ""
 
 # msgid "Cannot read apt archives directory.\n
 # msgstr "Impossible d'accéder au répertoire des archives apt.\n
-#: ../multistrap:660
+#: ../multistrap:668
 msgid "I: Native mode - configuring unpacked packages . . .\n"
 msgstr "I : mode natif, configure les paquets décompressés...\n"
 
-#: ../multistrap:671
+#: ../multistrap:679
 msgid "I: Running preinst scripts with 'upgrade' argument.\n"
 msgstr ""
 "I : en train de lancer les scripts de pré-installation en passant l'argument "
 "« upgrade ».\n"
 
-#: ../multistrap:694
+#: ../multistrap:702
 #, perl-format
 msgid "Cannot open %s directory. %s\n"
 msgstr "Impossible d'accéder au répertoire %s. %s\n"
 
-#: ../multistrap:725
+#: ../multistrap:733
 #, perl-format
 msgid "cannot open apt sources list. %s"
 msgstr "Impossible d'accéder à la liste des sources apt. %s"
 
-#: ../multistrap:731
+#: ../multistrap:739
 #, 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:736
+#: ../multistrap:744
 #, 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:748
+#: ../multistrap:756
 #, fuzzy, perl-format
 msgid ""
 "\n"
@@ -439,16 +434,16 @@ msgstr ""
 "sera créé. Il n'est pas empaqueté dans un .tgz une fois fini.\n"
 "\n"
 
-#: ../multistrap:814
+#: ../multistrap:822
 msgid "failed to write usage:"
 msgstr "Impossible d'afficher l'aide :"
 
-#: ../multistrap:871
+#: ../multistrap:880
 #, perl-format
 msgid "ERR: Cannot find include file: '%s' for '%s'"
 msgstr ""
 
-#: ../multistrap:912
+#: ../multistrap:926
 #, perl-format
 msgid ""
 "ERROR: Your version of apt is too old to support using a codename like '%s'. "
@@ -465,97 +460,143 @@ msgstr ""
 "experimental ». Vous pouvez également mettre à jour apt vers une version "
 "plus récente que 0.7.20.2+lenny1.\n"
 
-#: ../multistrap:932
+#: ../multistrap:946
 #, perl-format
 msgid "The supplied configuration file '%s' cannot be parsed correctly."
 msgstr ""
 "Le fichier de configuration fourni « %s » ne peut être lu correctement."
 
-#: ../multistrap:945
+#: ../multistrap:960
 #, perl-format
 msgid "ERR: The '%s' section is not defined.\n"
 msgstr "ERR : la section « %s » n'est pas définie.\n"
 
-#: ../multistrap:949
+#: ../multistrap:964
+#, fuzzy
 msgid "Including configuration file from:"
-msgstr "Inclusion du fichier de configuration depuis : "
+msgid_plural "Including configuration files from:"
+msgstr[0] "Inclusion du fichier de configuration depuis : "
+msgstr[1] "Inclusion du fichier de configuration depuis : "
 
-#: ../multistrap:951
+#: ../multistrap:968
 msgid "No included configuration files.\n"
 msgstr "Pas de fichier de configuration inclus.\n"
 
-#: ../multistrap:971 ../multistrap:972
+#: ../multistrap:988
-msgid "Sections"
+msgid "Not listed as a 'Bootstrap' section."
 msgstr ""
 
-#: ../multistrap:978
+#: ../multistrap:995
+msgid "Section to install"
+msgid_plural "Sections to install"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../multistrap:997
+msgid "Section for updates"
+msgid_plural "Sections for updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../multistrap:1004
 msgid "Omit deb-src from sources.list for sections:"
 msgstr "Omission de deb-src dans sources.list pour les sections : "
 
-#: ../multistrap:984
+#: ../multistrap:1006
+msgid "None."
+msgstr ""
+
+#: ../multistrap:1014
 msgid "Explicit suite selection: Yes\n"
 msgstr "Sélection des versions explicites : Oui\n"
 
-#: ../multistrap:986
+#: ../multistrap:1016
 msgid "Explicit suite selection: No - let apt use latest.\n"
 msgstr ""
 "Sélection des versions explicites : Non - laisser apt utiliser la plus "
 "récente.\n"
 
-#: ../multistrap:989
+#: ../multistrap:1019
 msgid "Recommended packages are added to the selection.\n"
 msgstr "Les paquets recommandés sont ajoutés à la sélection.\n"
 
-#: ../multistrap:991
+#: ../multistrap:1021
 msgid "Recommended packages are ignored.\n"
 msgstr "Les paquets recommandés sont ignorés.\n"
 
-#: ../multistrap:998
+#: ../multistrap:1023
-#, perl-format
+msgid "Extra Package: "
-msgid "Architecture: %s\n"
+msgid_plural "Extra Packages: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../multistrap:1029
+#, fuzzy, perl-format
+msgid "Architecture to download: %s\n"
 msgstr "Architecture : %s\n"
 
-#: ../multistrap:1000
+#: ../multistrap:1031
 #, perl-format
 msgid "Cannot determine architecture from '%s'.\n"
 msgstr "Impossible de déterminer l'architecture depuis « %s ».\n"
 
-#: ../multistrap:1003
+#: ../multistrap:1034
 #, perl-format
 msgid "Output directory: '%s'\n"
 msgstr "Répertoire de sortie : « %s »\n"
 
-#: ../multistrap:1005
+#: ../multistrap:1036
 #, perl-format
 msgid "Cannot determine directory from '%s'.\n"
 msgstr "Impossible de déterminer le répertoire depuis « %s ».\n"
 
-#: ../multistrap:1007
+#: ../multistrap:1038
 #, perl-format
 msgid "extract all downloaded archives: %s\n"
 msgstr "extrait toutes les archives téléchargées : %s\n"
 
-#: ../multistrap:1012
+#: ../multistrap:1040
+msgid "Script to be run after unpacking"
+msgstr ""
+
+#: ../multistrap:1042
+msgid "'Priority required' packages are not included."
+msgstr ""
+
+#: ../multistrap:1044
+msgid "'Priority: required' packages are included."
+msgstr ""
+
+#: ../multistrap:1047
 msgid "remove apt cache data: true\n"
 msgstr "supprime les données du cache d'apt : oui\n"
 
-#: ../multistrap:1014
+#: ../multistrap:1049
 msgid "remove apt cache data: false\n"
 msgstr "supprime les données du cache d'apt : non\n"
 
-#: ../multistrap:1017
+#: ../multistrap:1052
 msgid "allow the use of unauthenticated repositories: true\n"
 msgstr "autorise l'utilisation de dépôts non signés : oui\n"
 
-#: ../multistrap:1019
+#: ../multistrap:1054
 msgid "allow the use of unauthenticated repositories: false\n"
 msgstr "autorise l'utilisation de dépôts non signés : non\n"
 
-#: ../multistrap:1022
+#: ../multistrap:1057
 #, perl-format
 msgid "Sources will be retained in: %s\n"
 msgstr "Les sources seront conservées dans : %s\n"
 
+#: ../multistrap:1060
+#, perl-format
+msgid "Tarball name: '%s'\n"
+msgstr ""
+
+#, fuzzy
+#~ msgid "%s %s including %s\n"
+#~ msgstr "%s %s utilise %s\n"
+
 #~ msgid "Unable to create directory '%s'\n"
 #~ msgstr "Impossible de créer le répertoire « %s »\n"
 

po/pt.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-10-03 19:53+0100\n"
+"POT-Creation-Date: 2010-10-16 12:35+0100\n"
 "PO-Revision-Date: 2010-09-12 23:50+0100\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -26,28 +26,23 @@ 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, version string, include file.
-#: ../multistrap:98
-#, fuzzy, perl-format
-msgid "%s %s including %s\n"
-msgstr "%s %s a usar %s\n"
-
 #. Translators: fields are: programname, versionstring, configfile.
-#: ../multistrap:119
+#: ../multistrap:97 ../multistrap:120
 #, perl-format
 msgid "%s %s using %s\n"
 msgstr "%s %s a usar %s\n"
 
-#: ../multistrap:124 ../multistrap:126
+#: ../multistrap:125 ../multistrap:127
 #, perl-format
 msgid "Defaulting architecture to native: %s\n"
 msgstr "A usar como padrão a arquitectura nativa: %s\n"
 
-#: ../multistrap:128
+#: ../multistrap:129
 #, perl-format
 msgid "Using foreign architecture: %s\n"
 msgstr "A usar arquitectura estrangeira: %s\n"
 
-#: ../multistrap:133
+#: ../multistrap:134
 #, perl-format
 msgid ""
 "No sources defined for a foreign multistrap.\n"
@@ -59,77 +54,77 @@ msgstr ""
 "\tliste-as com aptsources= em '%s'."
 
 #. Translators: fields are: programname, architecture, host architecture.
-#: ../multistrap:141
+#: ../multistrap:142
 #, perl-format
 msgid "%s building %s multistrap on '%s'\n"
 msgstr "%s a criar multistrap para %s em '%s'\n"
 
-#: ../multistrap:143
+#: ../multistrap:144
 msgid "No directory specified!"
 msgstr ""
 
-#: ../multistrap:149
+#: ../multistrap:150
 #, perl-format
 msgid "Unable to create directory '%s'"
 msgstr "Não foi possível criar o directório '%s'"
 
-#: ../multistrap:200
+#: ../multistrap:201
 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr "INF: link simbólico ./lib64 -> /lib reposto para ./lib.\n"
 
-#: ../multistrap:208
+#: ../multistrap:209
 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n"
 msgstr "INF: A definir link simbólico ./lib64 -> ./lib.\n"
 
-#: ../multistrap:237 ../multistrap:242 ../multistrap:381 ../multistrap:386
+#: ../multistrap:238 ../multistrap:243 ../multistrap:389 ../multistrap:394
 msgid "Cannot open sources list"
 msgstr "Impossível abrir lista de fontes"
 
-#: ../multistrap:261
+#: ../multistrap:262
 #, perl-format
 msgid "I: Installing %s\n"
 msgstr "I: A instalar %s\n"
 
-#: ../multistrap:269
+#: ../multistrap:277
 #, perl-format
 msgid "Unable to download keyring package: '%s'"
 msgstr ""
 
-#: ../multistrap:307
+#: ../multistrap:315
 #, perl-format
 msgid "Getting package lists: apt-get %s update\n"
 msgstr "A obter listas de pacotes: apt-get %s update\n"
 
-#: ../multistrap:309
+#: ../multistrap:317
 #, perl-format
 msgid "apt update failed. Exit value: %d\n"
 msgstr "apt update falhou. Valor de saída: %d\n"
 
-#: ../multistrap:314
+#: ../multistrap:322
 msgid "I: Calculating required packages.\n"
 msgstr "I: A calcular pacotes necessários\n"
 
-#: ../multistrap:350
+#: ../multistrap:358
 #, perl-format
 msgid "apt download failed. Exit value: %d\n"
 msgstr "apt download falhou. Valor de saída: %d\n"
 
-#: ../multistrap:363
+#: ../multistrap:371
 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:364
+#: ../multistrap:372
 #, 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:371
+#: ../multistrap:379
 msgid "Cannot read apt sources list directory.\n"
 msgstr "Impossível ler directório de listas de fontes apt.\n"
 
-#: ../multistrap:400
+#: ../multistrap:408
 #, perl-format
 msgid ""
 "\n"
@@ -138,7 +133,7 @@ msgstr ""
 "\n"
 "Sistema multistrap instalado com sucesso em %s.\n"
 
-#: ../multistrap:402
+#: ../multistrap:410
 #, perl-format
 msgid ""
 "\n"
@@ -148,7 +143,7 @@ msgstr ""
 "A comprimir o sistema multistrap em '%s' para um ficheiro tar chamado: "
 "'%s'.\n"
 
-#: ../multistrap:408
+#: ../multistrap:416
 #, perl-format
 msgid ""
 "\n"
@@ -157,7 +152,7 @@ msgstr ""
 "\n"
 "A remover directório de criação: '%s'\n"
 
-#: ../multistrap:413
+#: ../multistrap:421
 #, perl-format
 msgid ""
 "\n"
@@ -166,30 +161,30 @@ msgstr ""
 "\n"
 "Sistema multistrap empacotado com sucesso como '%s'.\n"
 
-#: ../multistrap:439 ../multistrap:480 ../multistrap:633
+#: ../multistrap:447 ../multistrap:488 ../multistrap:641
 msgid "Cannot read apt archives directory.\n"
 msgstr "Impossível ler o directório de arquivos apt.\n"
 
-#: ../multistrap:452
+#: ../multistrap:460
 msgid "I: Calculating obsolete packages\n"
 msgstr "I: A calcular pacotes obsoletos\n"
 
-#: ../multistrap:466 ../multistrap:470
+#: ../multistrap:474 ../multistrap:478
 #, perl-format
 msgid "I: Removing %s\n"
 msgstr "I: A remover %s\n"
 
-#: ../multistrap:487
+#: ../multistrap:495
 #, perl-format
 msgid "Using directory %s for unpacking operations\n"
 msgstr "A usar o directório %s para operações de desempacotamento\n"
 
-#: ../multistrap:489
+#: ../multistrap:497
 #, perl-format
 msgid "I: Extracting %s...\n"
 msgstr "I: A extrair %s...\n"
 
-#: ../multistrap:502
+#: ../multistrap:510
 #, perl-format
 msgid ""
 "dpkg -X failed with error code %s\n"
@@ -198,49 +193,49 @@ msgstr ""
 "dpkg -X falhou com o código de erro %s\n"
 "A saltar....\n"
 
-#: ../multistrap:538
+#: ../multistrap:546
 #, perl-format
 msgid " -> Processing conffiles for %s\n"
 msgstr " -> A processar ficheiros de configuração para %s\n"
 
-#: ../multistrap:557
+#: ../multistrap:565
 #, perl-format
 msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n"
 msgstr "ERRO: link simbólico lib64 -> ./lib ocultado por %s\n"
 
-#: ../multistrap:560
+#: ../multistrap:568
 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n"
 msgstr "INF: link simbólico lib64 -> /lib reposto para ./lib.\n"
 
-#: ../multistrap:567
+#: ../multistrap:575
 msgid "I: Unpacking complete.\n"
 msgstr "I: Desempacotamento completo.\n"
 
-#: ../multistrap:580
+#: ../multistrap:588
 msgid "ERR: ./bin/sh symbolic link does not exist.\n"
 msgstr "ERRO: link simbólico ./bin/sh não existe.\n"
 
-#: ../multistrap:582
+#: ../multistrap:590
 msgid "INF: Setting ./bin/sh -> ./bin/dash\n"
 msgstr "INF: A definir link simbólico ./bin/sh -> ./bin/dash\n"
 
-#: ../multistrap:587
+#: ../multistrap:595
 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:602
+#: ../multistrap:610
 msgid "I: Tidying up apt cache and list data.\n"
 msgstr "I: A arrumar dados de lista e de apt cache.\n"
 
-#: ../multistrap:615
+#: ../multistrap:623
 msgid "Cannot read apt lists directory.\n"
 msgstr "Impossível ler directório de listas apt.\n"
 
-#: ../multistrap:623
+#: ../multistrap:631
 msgid "Cannot read apt cache directory.\n"
 msgstr "Impossível ler directório de cache apt.\n"
 
-#: ../multistrap:655
+#: ../multistrap:663
 #, perl-format
 msgid ""
 "I: dpkg configuration settings:\n"
@@ -249,7 +244,7 @@ msgstr ""
 "I: opções de configuração do dpkg:\n"
 "\t%s\n"
 
-#: ../multistrap:657
+#: ../multistrap:665
 msgid ""
 "W: Cannot use 'chroot' when fakeroot is in use. Skipping package "
 "configuration.\n"
@@ -259,35 +254,35 @@ msgstr ""
 
 # msgid "Cannot read apt archives directory.\n"
 # msgstr "Impossível ler directório/ de arquivos apt.\n"
-#: ../multistrap:660
+#: ../multistrap:668
 msgid "I: Native mode - configuring unpacked packages . . .\n"
 msgstr "I: Modo nativo - a configurar pacotes desempacotados . . .\n"
 
-#: ../multistrap:671
+#: ../multistrap:679
 msgid "I: Running preinst scripts with 'upgrade' argument.\n"
 msgstr "I: A correr scripts 'preinst' com o argumento 'upgrade'.\n"
 
-#: ../multistrap:694
+#: ../multistrap:702
 #, perl-format
 msgid "Cannot open %s directory. %s\n"
 msgstr "Impossível abrir o directório %s. %s\n"
 
-#: ../multistrap:725
+#: ../multistrap:733
 #, perl-format
 msgid "cannot open apt sources list. %s"
 msgstr "impossível abrir lista de fontes apt. %s"
 
-#: ../multistrap:731
+#: ../multistrap:739
 #, perl-format
 msgid "cannot open apt sources.list directory %s\n"
 msgstr "impossível abrir directório de apt sources.list %s\n"
 
-#: ../multistrap:736
+#: ../multistrap:744
 #, perl-format
 msgid "cannot open /etc/apt/sources.list.d/%s %s"
 msgstr "impossível abrir /etc/apt/sources.list.d/%s %s"
 
-#: ../multistrap:748
+#: ../multistrap:756
 #, fuzzy, perl-format
 msgid ""
 "\n"
@@ -427,16 +422,16 @@ msgstr ""
 "será criado - não será empacotado num .tgz após ficar completo.\n"
 "\n"
 
-#: ../multistrap:814
+#: ../multistrap:822
 msgid "failed to write usage:"
 msgstr "falhou a escrita do modo de utilização:"
 
-#: ../multistrap:871
+#: ../multistrap:880
 #, perl-format
 msgid "ERR: Cannot find include file: '%s' for '%s'"
 msgstr ""
 
-#: ../multistrap:912
+#: ../multistrap:926
 #, perl-format
 msgid ""
 "ERROR: Your version of apt is too old to support using a codename like '%s'. "
@@ -452,94 +447,140 @@ msgstr ""
 "'experimental'.Em alternativa, actualize o apt para uma versão mais recente "
 "que 0.7.20.2+lenny1.\n"
 
-#: ../multistrap:932
+#: ../multistrap:946
 #, perl-format
 msgid "The supplied configuration file '%s' cannot be parsed correctly."
 msgstr "O ficheiro de configuração '%s' não pode ser analisado correctamente."
 
-#: ../multistrap:945
+#: ../multistrap:960
 #, perl-format
 msgid "ERR: The '%s' section is not defined.\n"
 msgstr "ERR: A secção '%s' não está definida.\n"
 
-#: ../multistrap:949
+#: ../multistrap:964
+#, fuzzy
 msgid "Including configuration file from:"
-msgstr "A incluir ficheiro de configuração de: "
+msgid_plural "Including configuration files from:"
+msgstr[0] "A incluir ficheiro de configuração de: "
+msgstr[1] "A incluir ficheiro de configuração de: "
 
-#: ../multistrap:951
+#: ../multistrap:968
 msgid "No included configuration files.\n"
 msgstr "Não foram incluídos ficheiros de configuração.\n"
 
-#: ../multistrap:971 ../multistrap:972
+#: ../multistrap:988
-msgid "Sections"
+msgid "Not listed as a 'Bootstrap' section."
 msgstr ""
 
-#: ../multistrap:978
+#: ../multistrap:995
+msgid "Section to install"
+msgid_plural "Sections to install"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../multistrap:997
+msgid "Section for updates"
+msgid_plural "Sections for updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../multistrap:1004
 msgid "Omit deb-src from sources.list for sections:"
 msgstr "Omitir deb-src do sources.list para as secções:"
 
-#: ../multistrap:984
+#: ../multistrap:1006
+msgid "None."
+msgstr ""
+
+#: ../multistrap:1014
 msgid "Explicit suite selection: Yes\n"
 msgstr "Selecção explícita de 'suite': Sim\n"
 
-#: ../multistrap:986
+#: ../multistrap:1016
 msgid "Explicit suite selection: No - let apt use latest.\n"
 msgstr "Selecção explícita de 'suite': Não - deixar o apr usar a última.\n"
 
-#: ../multistrap:989
+#: ../multistrap:1019
 msgid "Recommended packages are added to the selection.\n"
 msgstr "Pacotes recomendados são acrescentados à selecção.\n"
 
-#: ../multistrap:991
+#: ../multistrap:1021
 msgid "Recommended packages are ignored.\n"
 msgstr "Pacotes recomendados são ignorados.\n"
 
-#: ../multistrap:998
+#: ../multistrap:1023
-#, perl-format
+msgid "Extra Package: "
-msgid "Architecture: %s\n"
+msgid_plural "Extra Packages: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../multistrap:1029
+#, fuzzy, perl-format
+msgid "Architecture to download: %s\n"
 msgstr "Arquitectura: %s\n"
 
-#: ../multistrap:1000
+#: ../multistrap:1031
 #, perl-format
 msgid "Cannot determine architecture from '%s'.\n"
 msgstr "Impossível determinar a arquitectura a partir de '%s'.\n"
 
-#: ../multistrap:1003
+#: ../multistrap:1034
 #, perl-format
 msgid "Output directory: '%s'\n"
 msgstr "Directório de saída: '%s'\n"
 
-#: ../multistrap:1005
+#: ../multistrap:1036
 #, perl-format
 msgid "Cannot determine directory from '%s'.\n"
 msgstr "Impossível determinar o directório a partir de '%s'.\n"
 
-#: ../multistrap:1007
+#: ../multistrap:1038
 #, perl-format
 msgid "extract all downloaded archives: %s\n"
 msgstr "extrair todos os arquivos descarregados: %s\n"
 
-#: ../multistrap:1012
+#: ../multistrap:1040
+msgid "Script to be run after unpacking"
+msgstr ""
+
+#: ../multistrap:1042
+msgid "'Priority required' packages are not included."
+msgstr ""
+
+#: ../multistrap:1044
+msgid "'Priority: required' packages are included."
+msgstr ""
+
+#: ../multistrap:1047
 msgid "remove apt cache data: true\n"
 msgstr "remover cache de dados do apt: verdadeiro\n"
 
-#: ../multistrap:1014
+#: ../multistrap:1049
 msgid "remove apt cache data: false\n"
 msgstr "remover cache de dados do apt: falso\n"
 
-#: ../multistrap:1017
+#: ../multistrap:1052
 msgid "allow the use of unauthenticated repositories: true\n"
 msgstr "permitir o uso de repositórios não autenticados: verdadeiro\n"
 
-#: ../multistrap:1019
+#: ../multistrap:1054
 msgid "allow the use of unauthenticated repositories: false\n"
 msgstr "permitir o uso de repositórios não autenticados: falso\n"
 
-#: ../multistrap:1022
+#: ../multistrap:1057
 #, perl-format
 msgid "Sources will be retained in: %s\n"
 msgstr "Fontes serão guardadas em: %s\n"
 
+#: ../multistrap:1060
+#, perl-format
+msgid "Tarball name: '%s'\n"
+msgstr ""
+
+#, fuzzy
+#~ msgid "%s %s including %s\n"
+#~ msgstr "%s %s a usar %s\n"
+
 #~ msgid "Unable to create directory '%s'\n"
 #~ msgstr "Não foi possível criar o directório '%s'\n"
 

po/vi.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: multistrap 2.1.7\n"
 "Report-Msgid-Bugs-To: multistrap@packages.debian.org\n"
-"POT-Creation-Date: 2010-10-03 19:53+0100\n"
+"POT-Creation-Date: 2010-10-16 12:35+0100\n"
 "PO-Revision-Date: 2010-09-29 19:59+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -27,28 +27,23 @@ 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, version string, include file.
-#: ../multistrap:98
-#, fuzzy, perl-format
-msgid "%s %s including %s\n"
-msgstr "%s %s dùng %s\n"
-
 #. Translators: fields are: programname, versionstring, configfile.
-#: ../multistrap:119
+#: ../multistrap:97 ../multistrap:120
 #, perl-format
 msgid "%s %s using %s\n"
 msgstr "%s %s dùng %s\n"
 
-#: ../multistrap:124 ../multistrap:126
+#: ../multistrap:125 ../multistrap:127
 #, 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:128
+#: ../multistrap:129
 #, perl-format
 msgid "Using foreign architecture: %s\n"
 msgstr "Dùng kiến trúc ngoài: %s\n"
 
-#: ../multistrap:133
+#: ../multistrap:134
 #, perl-format
 msgid ""
 "No sources defined for a foreign multistrap.\n"
@@ -61,79 +56,79 @@ msgstr ""
 "\tdùng cú pháp « aptsources= »."
 
 #. Translators: fields are: programname, architecture, host architecture.
-#: ../multistrap:141
+#: ../multistrap:142
 #, perl-format
 msgid "%s building %s multistrap on '%s'\n"
 msgstr "%s đang xây dựng multistrap %s trên « %s »\n"
 
-#: ../multistrap:143
+#: ../multistrap:144
 msgid "No directory specified!"
 msgstr ""
 
-#: ../multistrap:149
+#: ../multistrap:150
 #, perl-format
 msgid "Unable to create directory '%s'"
 msgstr "Không thể tạo thư mục « %s »"
 
-#: ../multistrap:200
+#: ../multistrap:201
 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:208
+#: ../multistrap:209
 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n"
 msgstr "TIN: Đang đặt liên kết tượng trưng « ./lib64 » -> « ./lib ».\n"
 
-#: ../multistrap:237 ../multistrap:242 ../multistrap:381 ../multistrap:386
+#: ../multistrap:238 ../multistrap:243 ../multistrap:389 ../multistrap:394
 msgid "Cannot open sources list"
 msgstr "Không mở được danh sách nguồn"
 
-#: ../multistrap:261
+#: ../multistrap:262
 #, perl-format
 msgid "I: Installing %s\n"
 msgstr "TIN: Đang cài đặt %s\n"
 
-#: ../multistrap:269
+#: ../multistrap:277
 #, perl-format
 msgid "Unable to download keyring package: '%s'"
 msgstr ""
 
 # « apt-get » và « update » thuộc về một câu lệnh nghĩa chữ
-#: ../multistrap:307
+#: ../multistrap:315
 #, perl-format
 msgid "Getting package lists: apt-get %s update\n"
 msgstr "Đang lấy các danh sách gói: apt-get %s update\n"
 
-#: ../multistrap:309
+#: ../multistrap:317
 #, perl-format
 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:314
+#: ../multistrap:322
 msgid "I: Calculating required packages.\n"
 msgstr "TIN: Đang tính các gói yêu cầu.\n"
 
-#: ../multistrap:350
+#: ../multistrap:358
 #, 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:371
 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:372
 #, 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:379
 msgid "Cannot read apt sources list directory.\n"
 msgstr "Không đọc được thư mục danh sách nguồn apt.\n"
 
-#: ../multistrap:400
+#: ../multistrap:408
 #, perl-format
 msgid ""
 "\n"
@@ -143,7 +138,7 @@ msgstr ""
 "Hệ thống multistrap đã được cài đặt thành công vào %s.\n"
 "\n"
 
-#: ../multistrap:402
+#: ../multistrap:410
 #, perl-format
 msgid ""
 "\n"
@@ -152,7 +147,7 @@ msgstr ""
 "\n"
 "Đang nén hệ thống multistrap trong « %s » thành một kho lưu tên: « %s ».\n"
 
-#: ../multistrap:408
+#: ../multistrap:416
 #, perl-format
 msgid ""
 "\n"
@@ -161,7 +156,7 @@ msgstr ""
 "\n"
 "Đang gỡ bỏ thư mục xây dựng: « %s »\n"
 
-#: ../multistrap:413
+#: ../multistrap:421
 #, perl-format
 msgid ""
 "\n"
@@ -171,30 +166,30 @@ msgstr ""
 "Hệ thống multistrap đã được đóng gói thành công thành « %s ».\n"
 "\n"
 
-#: ../multistrap:439 ../multistrap:480 ../multistrap:633
+#: ../multistrap:447 ../multistrap:488 ../multistrap:641
 msgid "Cannot read apt archives directory.\n"
 msgstr "Không đọc được thư mục kho lưu apt.\n"
 
-#: ../multistrap:452
+#: ../multistrap:460
 msgid "I: Calculating obsolete packages\n"
 msgstr "TIN: Đang tính các gói cũ\n"
 
-#: ../multistrap:466 ../multistrap:470
+#: ../multistrap:474 ../multistrap:478
 #, perl-format
 msgid "I: Removing %s\n"
 msgstr "TIN: Đang gỡ bỏ %s\n"
 
-#: ../multistrap:487
+#: ../multistrap:495
 #, 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:489
+#: ../multistrap:497
 #, perl-format
 msgid "I: Extracting %s...\n"
 msgstr "TIN: Đang giải nén %s...\n"
 
-#: ../multistrap:502
+#: ../multistrap:510
 #, perl-format
 msgid ""
 "dpkg -X failed with error code %s\n"
@@ -203,52 +198,52 @@ msgstr ""
 "« dpkg -X » bị lỗi với mã lỗi %s\n"
 "Đang bỏ qua...\n"
 
-#: ../multistrap:538
+#: ../multistrap:546
 #, 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:557
+#: ../multistrap:565
 #, 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:560
+#: ../multistrap:568
 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:567
+#: ../multistrap:575
 msgid "I: Unpacking complete.\n"
 msgstr "TIN: Hoàn tất mở gói.\n"
 
-#: ../multistrap:580
+#: ../multistrap:588
 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:582
+#: ../multistrap:590
 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:587
+#: ../multistrap:595
 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:602
+#: ../multistrap:610
 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:615
+#: ../multistrap:623
 msgid "Cannot read apt lists directory.\n"
 msgstr "Không đọc được thư mục danh sách apt.\n"
 
-#: ../multistrap:623
+#: ../multistrap:631
 msgid "Cannot read apt cache directory.\n"
 msgstr "Không đọc được thư mục nhớ tạm apt.\n"
 
-#: ../multistrap:655
+#: ../multistrap:663
 #, perl-format
 msgid ""
 "I: dpkg configuration settings:\n"
@@ -257,7 +252,7 @@ msgstr ""
 "TIN: Thiết lập cấu hình dpkg:\n"
 "\t%s\n"
 
-#: ../multistrap:657
+#: ../multistrap:665
 msgid ""
 "W: Cannot use 'chroot' when fakeroot is in use. Skipping package "
 "configuration.\n"
@@ -265,36 +260,36 @@ msgstr ""
 "CB: Không thể sử dụng « chroot » khi cũng dùng fakeroot. Vì thế đang bỏ qua "
 "bước cấu hình gói.\n"
 
-#: ../multistrap:660
+#: ../multistrap:668
 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:671
+#: ../multistrap:679
 msgid "I: Running preinst scripts with 'upgrade' argument.\n"
 msgstr ""
 "TIN: Đang chạy các văn lệnh cài đặt sẵn với đối số « upgrade » (nâng cấp).\n"
 
-#: ../multistrap:694
+#: ../multistrap:702
 #, perl-format
 msgid "Cannot open %s directory. %s\n"
 msgstr "Không mở được thư mục %s. %s\n"
 
-#: ../multistrap:725
+#: ../multistrap:733
 #, perl-format
 msgid "cannot open apt sources list. %s"
 msgstr "không mở được danh sách nguồn apt. %s"
 
-#: ../multistrap:731
+#: ../multistrap:739
 #, 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:736
+#: ../multistrap:744
 #, 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:748
+#: ../multistrap:756
 #, fuzzy, perl-format
 msgid ""
 "\n"
@@ -435,16 +430,16 @@ 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:814
+#: ../multistrap:822
 msgid "failed to write usage:"
 msgstr "lỗi ghi cách sử dụng:"
 
-#: ../multistrap:871
+#: ../multistrap:880
 #, perl-format
 msgid "ERR: Cannot find include file: '%s' for '%s'"
 msgstr ""
 
-#: ../multistrap:912
+#: ../multistrap:926
 #, perl-format
 msgid ""
 "ERROR: Your version of apt is too old to support using a codename like '%s'. "
@@ -464,94 +459,136 @@ msgstr ""
 " • experimental\t\tdựa trên thí nghiệmHoặc bạn có thể nâng cấp lên một phiên "
 "bản apt mới hơn 0.7.20.2+lenny1.\n"
 
-#: ../multistrap:932
+#: ../multistrap:946
 #, perl-format
 msgid "The supplied configuration file '%s' cannot be parsed correctly."
 msgstr "Không thể phân tích đúng tập tin cấu hình « %s » được cung cấp."
 
-#: ../multistrap:945
+#: ../multistrap:960
 #, perl-format
 msgid "ERR: The '%s' section is not defined.\n"
 msgstr "LỖI: chưa xác định phần « %s ».\n"
 
-#: ../multistrap:949
+#: ../multistrap:964
+#, fuzzy
 msgid "Including configuration file from:"
-msgstr "Gồm có tập tin cấu hình từ : "
+msgid_plural "Including configuration files from:"
+msgstr[0] "Gồm có tập tin cấu hình từ : "
 
-#: ../multistrap:951
+#: ../multistrap:968
 msgid "No included configuration files.\n"
 msgstr "Không bao gồm tập tin cấu hình nào.\n"
 
-#: ../multistrap:971 ../multistrap:972
+#: ../multistrap:988
-msgid "Sections"
+msgid "Not listed as a 'Bootstrap' section."
 msgstr ""
 
-#: ../multistrap:978
+#: ../multistrap:995
+msgid "Section to install"
+msgid_plural "Sections to install"
+msgstr[0] ""
+
+#: ../multistrap:997
+msgid "Section for updates"
+msgid_plural "Sections for updates"
+msgstr[0] ""
+
+#: ../multistrap:1004
 msgid "Omit deb-src from sources.list for sections:"
 msgstr "Bỏ sót deb-src khỏi sources.list cho các phần:"
 
-#: ../multistrap:984
+#: ../multistrap:1006
+msgid "None."
+msgstr ""
+
+#: ../multistrap:1014
 msgid "Explicit suite selection: Yes\n"
 msgstr "Chọn dứt khoát bộ ứng dụng: Có\n"
 
-#: ../multistrap:986
+#: ../multistrap:1016
 msgid "Explicit suite selection: No - let apt use latest.\n"
 msgstr "Chọn dứt khoát bộ ứng dụng: Không, cho phép apt dùng bộ mới nhất.\n"
 
-#: ../multistrap:989
+#: ../multistrap:1019
 msgid "Recommended packages are added to the selection.\n"
 msgstr "Các gói khuyến khích được thêm vào vùng chọn.\n"
 
-#: ../multistrap:991
+#: ../multistrap:1021
 msgid "Recommended packages are ignored.\n"
 msgstr "Các gói khuyến khích bị bỏ qua.\n"
 
-#: ../multistrap:998
+#: ../multistrap:1023
-#, perl-format
+msgid "Extra Package: "
-msgid "Architecture: %s\n"
+msgid_plural "Extra Packages: "
+msgstr[0] ""
+
+#: ../multistrap:1029
+#, fuzzy, perl-format
+msgid "Architecture to download: %s\n"
 msgstr "Kiến trúc: %s\n"
 
-#: ../multistrap:1000
+#: ../multistrap:1031
 #, perl-format
 msgid "Cannot determine architecture from '%s'.\n"
 msgstr "Không thể quyết định kiến trúc từ « %s ».\n"
 
-#: ../multistrap:1003
+#: ../multistrap:1034
 #, perl-format
 msgid "Output directory: '%s'\n"
 msgstr "Thư mục kết xuất: « %s »\n"
 
-#: ../multistrap:1005
+#: ../multistrap:1036
 #, perl-format
 msgid "Cannot determine directory from '%s'.\n"
 msgstr "Không thể quyết định thư mục từ « %s ».\n"
 
-#: ../multistrap:1007
+#: ../multistrap:1038
 #, perl-format
 msgid "extract all downloaded archives: %s\n"
 msgstr "giải nén mỗi kho nén được tải về: %s\n"
 
-#: ../multistrap:1012
+#: ../multistrap:1040
+msgid "Script to be run after unpacking"
+msgstr ""
+
+#: ../multistrap:1042
+msgid "'Priority required' packages are not included."
+msgstr ""
+
+#: ../multistrap:1044
+msgid "'Priority: required' packages are included."
+msgstr ""
+
+#: ../multistrap:1047
 msgid "remove apt cache data: true\n"
 msgstr "gỡ bỏ dữ liệu nhớ tạm apt: đúng\n"
 
-#: ../multistrap:1014
+#: ../multistrap:1049
 msgid "remove apt cache data: false\n"
 msgstr "gỡ bỏ dữ liệu nhớ tạm apt: sai\n"
 
-#: ../multistrap:1017
+#: ../multistrap:1052
 msgid "allow the use of unauthenticated repositories: true\n"
 msgstr "cho phép sử dụng kho lưu trữ chưa xác thực: đúng\n"
 
-#: ../multistrap:1019
+#: ../multistrap:1054
 msgid "allow the use of unauthenticated repositories: false\n"
 msgstr "cho phép sử dụng kho lưu trữ chưa xác thực: sai\n"
 
-#: ../multistrap:1022
+#: ../multistrap:1057
 #, perl-format
 msgid "Sources will be retained in: %s\n"
 msgstr "Các nguồn sẽ được giữ lại trong: %s\n"
 
+#: ../multistrap:1060
+#, perl-format
+msgid "Tarball name: '%s'\n"
+msgstr ""
+
+#, fuzzy
+#~ msgid "%s %s including %s\n"
+#~ msgstr "%s %s dùng %s\n"
+
 #~ msgid "Unable to create directory '%s'\n"
 #~ msgstr "Không thể tạo thư mục « %s »\n"
 

pod/multistrap

@@ -480,3 +480,56 @@ installation of the keyring package on the host system is also skipped
 if fakeroot is detected.
 
 =cut
+
+=head1 Handling problematic packages
+
+Sometimes, a particular package will fail to even unpack properly if
+other packages have not already been unpacked. This can happen if
+dpkg diversions are not setup correctly or if the package Pre-Depends
+on an executable in another package.
+
+Multistrap offers two ways to handle these problems. A package can be
+listed as C<reinstall> or as C<additional>. Each section in the
+C<multistrap> configuration file can have a single C<reinstall> or
+C<additional> listing or both.
+
+Reinstall means that the package will be downloaded and unpacked as
+normal - alongside all the other packages, but will then be reinstalled
+at the end by running the C<preinst> maintainer script with the
+C<upgrade> argument. C<dpkg> will then continue the rest of the
+configuration of that package.
+
+Additional adds a second round of C<apt-get install> to the multistrap
+process - after the initial unpacking. The additional package will
+then be downloaded and unpacked. If running natively, the additional
+package is downloaded, unpacked and configured after all the
+rest of the packages have been downloaded, unpacked and configured.
+
+Neither C<reinstall> nor C<additional> should be seen as more than
+just workarounds and wishlist bugs should be filed in Debian against
+packages which require the use of these mechanisms (or the packages
+which would prevent the particular package from operating normally).
+
+=cut
+
+=head1 Bugs
+
+As C<multistrap> gets more complex, bugs will creep into the package.
+When reporting bugs against multistrap, B<please> attach all
+configuration files. If your configuration needs to access local or
+private apt repositories, please check your configuration with the
+latest version of C<multistrap> in Debian using the C<--simulate>
+option and include that report in your bug report.
+
+The C<--simulate> option output is regularly expanded to help users
+debug problems in the configuration files.
+
+Please also check (and update) the Multistrap wiki at
+http://wiki.debian.org/Multistrap and the Multistrap webpage content
+at http://www.emdebian.org/multistrap/ before filing bugs. Various
+people on the debian-embedded@lists.debian.org mailing list and
+#emdebian IRC channel on irc.oftc.net can also help - if you can put
+the C<--simulate> output on a pastebin website and put the URL in
+your message.
+
+=cut