diff --git a/debian/changelog b/debian/changelog index 84576ae..29d10ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ multistrap (2.1.9) experimental; urgency=low missing file. * Document changes in packages key support and advise on reporting bugs via the BTS + * Add support for addimportant in the general section only. + (Closes: #610634) - -- Neil Williams Sat, 25 Dec 2010 12:34:03 +0000 + -- Neil Williams Sat, 22 Jan 2011 23:43:27 +0000 multistrap (2.1.8) experimental; urgency=low diff --git a/doc/po/de.po b/doc/po/de.po index dcc0081..57e3094 100644 --- a/doc/po/de.po +++ b/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-12-25 17:21+0000\n" +"POT-Creation-Date: 2011-01-23 00:13+0000\n" "PO-Revision-Date: 2010-09-07 21:30+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -1148,9 +1148,13 @@ msgstr "Paketauswahl einschränken" #. type: textblock #: pod/multistrap:410 +#, fuzzy +#| msgid "" +#| "C includes Required packages by default, the current list of " +#| "packages can be seen using:" msgid "" "C includes Required packages by default, the current list of " -"packages can be seen using:" +"packages on your own machine can be seen using:" msgstr "" "C schließt standardmäßig benötigte Pakete ein, die aktuelle " "Liste der Pakete kann angesehen werden unter Benutzung von:" @@ -1168,6 +1172,13 @@ msgstr "" #. type: textblock #: pod/multistrap:415 msgid "" +"(The actual list is calculated from the downloaded Packages files and may " +"differ from the output of C.)" +msgstr "" + +#. type: textblock +#: pod/multistrap:418 +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 " "packages specified manually in the configuration files will be used in the " @@ -1179,25 +1190,53 @@ msgstr "" "Konfigurationsdateien angegebenen Pakete werden in den Berechnungen benutzt " "– Abhängigkeiten dieser Pakete werden hinzugefügt, aber keine anderen." +#. type: =head1 +#: pod/multistrap:424 +msgid "Adding Priority: important packages" +msgstr "" + +#. type: textblock +#: pod/multistrap:426 +msgid "" +"C can imitate C by automatically adding all " +"packages from all sections where the downloaded Packages file lists the " +"package as Priority: important. The default is not to add such packages " +"unless individually included in a C option in a section specified " +"in the C general option. To add all such packages, set the " +"addimportant option to true in the general section." +msgstr "" + +#. type: verbatim +#: pod/multistrap:434 +#, no-wrap +msgid "" +" addimportant=true\n" +"\n" +msgstr "" + +#. type: textblock +#: pod/multistrap:436 +msgid "" +"Priority: important can only operate for all sections listed in the " +"C option. This may cause some confusion when mixing suites." +msgstr "" + #. type: textblock -#: pod/multistrap:421 +#: pod/multistrap:439 msgid "" -"Packages with Priority: important or standard are never included by " -"C unless specifically included in a C option in a " -"section specified in the C general option." +"It is not possible to enable addimportant and omitrequired in the same " +"configuration. C will exit with error code 7 if any " +"configuration results in addimportant and omitrequired both being set to " +"true. (This includes the effects of including other configuration files.)" msgstr "" -"Pakete mit der Priorität »important« oder »standard« werden niemals von " -"C eingeschlossen, außer wenn sie speziell in einer C-" -"Option in einem Abschnitt in den allgemeinen C-Optionen enthalten " -"sind." #. type: =head1 -#: pod/multistrap:425 +#: pod/multistrap:445 msgid "Recommends behaviour" msgstr "Empfohlenes Verhalten" #. type: textblock -#: pod/multistrap:427 +#: pod/multistrap:447 msgid "" "The Debian default behaviour after the Lenny release was to consider " "recommended packages as extra packages to be installed when any one package " @@ -1213,12 +1252,12 @@ msgstr "" "erlaubte Empfehlungen empfohlener Pakete usw." #. type: textblock -#: pod/multistrap:434 +#: pod/multistrap:454 msgid "The multistrap default is to turn recommends OFF." msgstr "Standardmäßig sind Empfehlungen in Multistrap AUSgeschaltet." #. type: textblock -#: pod/multistrap:436 +#: pod/multistrap:456 msgid "" "Set the allowrecommends option to true in the General section to use typical " "Debian behaviour." @@ -1227,12 +1266,12 @@ msgstr "" "um typisches Debian-Verhalten zu bekommen." #. type: =head1 -#: pod/multistrap:439 +#: pod/multistrap:459 msgid "Explicit suite specification" msgstr "Explizite Angabe der Suite" #. type: textblock -#: pod/multistrap:441 +#: pod/multistrap:461 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 " @@ -1244,7 +1283,7 @@ msgstr "" "wird." #. type: textblock -#: pod/multistrap:445 +#: pod/multistrap:465 msgid "" "C can operate with and without the explicit suite option, the " "default is to let apt use the most recent version from the collection of " @@ -1255,7 +1294,7 @@ msgstr "" "F-Quellen benutzen." #. type: textblock -#: pod/multistrap:449 +#: pod/multistrap:469 msgid "" "Explicit suite specification has no effect on the final installed system - " "if your aptsources includes a repository which in turn includes a newer " @@ -1269,7 +1308,7 @@ msgstr "" "führen." #. type: textblock -#: pod/multistrap:454 +#: pod/multistrap:474 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 " @@ -1289,7 +1328,7 @@ msgstr "" "treffen müssen." #. type: textblock -#: pod/multistrap:461 +#: pod/multistrap:481 msgid "" "When using this support in Lenny, ensure that each section uses the suite " "(oldstable, stable, testing, sid) and B the codename (etch, lenny, " @@ -1303,12 +1342,12 @@ msgstr "" "in Lenny und früher den Codenamen nicht benutzen kann." #. type: textblock -#: pod/multistrap:466 +#: pod/multistrap:486 msgid "To test, on Lenny, try:" msgstr "Für einen Test unter Lenny probieren Sie:" #. type: verbatim -#: pod/multistrap:468 +#: pod/multistrap:488 #, no-wrap msgid "" " $ sudo apt-get install apt/stable\n" @@ -1318,12 +1357,12 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:470 +#: pod/multistrap:490 msgid "Compare with" msgstr "Vergleichen Sie mit" #. type: verbatim -#: pod/multistrap:472 +#: pod/multistrap:492 #, no-wrap msgid "" " $ sudo apt-get install apt/lenny\n" @@ -1333,7 +1372,7 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:474 +#: pod/multistrap:494 msgid "" "When using explicitsuite, take care in using stable-proposed-updates or " "other temporary locations - if the package migrates into another suite and " @@ -1342,12 +1381,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:480 +#: pod/multistrap:500 msgid "Omitting deb-src listings" msgstr "»deb-src«-Auflistungen werden ausgelassen" #. type: textblock -#: pod/multistrap:482 +#: pod/multistrap:502 msgid "" "Some multistrap environments do not need access to the Debian sources of " "packages being installed, typically this is required when preparing a build " @@ -1359,7 +1398,7 @@ msgstr "" "Multistrap vorbereitet wird." #. type: textblock -#: pod/multistrap:486 +#: pod/multistrap:506 msgid "" "To turn off this additional source (and save both download time and apt-" "cache size), use the omitdebsrc field in each Section." @@ -1369,7 +1408,7 @@ msgstr "" "jedem Abschnitt." #. type: verbatim -#: pod/multistrap:489 +#: pod/multistrap:509 #, no-wrap msgid "" " [Baked]\n" @@ -1389,19 +1428,19 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:496 +#: pod/multistrap:516 msgid "" "omitdebsrc is necessary when using packages from debian-ports where packages " "do not have sources, except \"unreleased\"." msgstr "" #. type: =head1 -#: pod/multistrap:499 +#: pod/multistrap:519 msgid "fakeroot" msgstr "fakeroot" #. type: textblock -#: pod/multistrap:501 +#: pod/multistrap:521 msgid "" "Foreign architecture bootstraps can operate under C (C " "is designed to do as much as it can within a single call to make this " @@ -1416,7 +1455,7 @@ msgstr "" "C, und C seinerseits funktioniert nicht unter C." #. type: textblock -#: pod/multistrap:507 +#: pod/multistrap:527 msgid "" "Therefore, if C detects that C is in use, native mode " "configuration is skipped with a reminder warning." @@ -1426,7 +1465,7 @@ msgstr "" "benutzt wird." #. type: textblock -#: pod/multistrap:510 +#: pod/multistrap:530 msgid "" "The same problem applies to C and therefore the " "installation of the keyring package on the host system is also skipped if " @@ -1437,12 +1476,12 @@ msgstr "" "übersprungen, falls Fakeroot erkannt wird." #. type: =head1 -#: pod/multistrap:514 +#: pod/multistrap:534 msgid "Handling problematic packages" msgstr "" #. type: textblock -#: pod/multistrap:516 +#: pod/multistrap:536 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 " @@ -1451,7 +1490,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:521 +#: pod/multistrap:541 msgid "" "Multistrap offers two ways to handle these problems. A package can be listed " "as C or as C. Each section in the C " @@ -1460,7 +1499,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:526 +#: pod/multistrap:546 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 " @@ -1469,7 +1508,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:532 +#: pod/multistrap:552 msgid "" "Additional adds a second round of C to the multistrap " "process - after the initial unpacking. The additional package will then be " @@ -1479,7 +1518,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:538 +#: pod/multistrap:558 msgid "" "Neither C nor C should be seen as more than just " "workarounds and wishlist bugs should be filed in Debian against packages " @@ -1488,12 +1527,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:543 +#: pod/multistrap:563 msgid "Output" msgstr "" #. type: textblock -#: pod/multistrap:545 +#: pod/multistrap:565 msgid "" "C can produce a lot of output - informational messages appear on " "STDOUT, errors and warnings on STDERR. Calls to C and C respect " @@ -1502,12 +1541,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:550 +#: pod/multistrap:570 msgid "Bugs" msgstr "" #. type: textblock -#: pod/multistrap:552 +#: pod/multistrap:572 msgid "" "As C gets more complex, bugs will creep into the package. " "Please report all bugs to the Debian BTS using the C tool and " @@ -1518,14 +1557,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:559 +#: pod/multistrap:579 msgid "" "The C<--simulate> option output is regularly expanded to help users debug " "problems in the configuration files." msgstr "" #. type: textblock -#: pod/multistrap:562 +#: pod/multistrap:582 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/" @@ -1696,6 +1735,16 @@ msgstr "" msgid "See http://wiki.debian.org/DeviceTableScripting" msgstr "Siehe http://wiki.debian.org/DeviceTableScripting" +#~ msgid "" +#~ "Packages with Priority: important or standard are never included by " +#~ "C unless specifically included in a C option in a " +#~ "section specified in the C general option." +#~ msgstr "" +#~ "Pakete mit der Priorität »important« oder »standard« werden niemals von " +#~ "C eingeschlossen, außer wenn sie speziell in einer " +#~ "C-Option in einem Abschnitt in den allgemeinen C-" +#~ "Optionen enthalten sind." + #~ msgid "" #~ "'packages' is the list of packages to be added when this Section is " #~ "listed in C." diff --git a/doc/po/fr.po b/doc/po/fr.po index a904dd3..7562c67 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.4\n" -"POT-Creation-Date: 2010-12-25 17:21+0000\n" +"POT-Creation-Date: 2011-01-23 00:13+0000\n" "PO-Revision-Date: 2010-09-11 13:13+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -1152,9 +1152,13 @@ msgstr "Restriction de la sélection des paquets" #. type: textblock #: pod/multistrap:410 +#, fuzzy +#| msgid "" +#| "C includes Required packages by default, the current list of " +#| "packages can be seen using:" msgid "" "C includes Required packages by default, the current list of " -"packages can be seen using:" +"packages on your own machine can be seen using:" msgstr "" "C inclut les paquets requis par défaut, la liste actuelle des " "paquets peut être visualisée en utilisant : " @@ -1172,6 +1176,13 @@ msgstr "" #. type: textblock #: pod/multistrap:415 msgid "" +"(The actual list is calculated from the downloaded Packages files and may " +"differ from the output of C.)" +msgstr "" + +#. type: textblock +#: pod/multistrap:418 +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 " "packages specified manually in the configuration files will be used in the " @@ -1183,25 +1194,53 @@ msgstr "" "configuration seront utilisés dans les calculs - les dépendances de ces " "paquets seront également ajoutées mais aucun autre." +#. type: =head1 +#: pod/multistrap:424 +msgid "Adding Priority: important packages" +msgstr "" + +#. type: textblock +#: pod/multistrap:426 +msgid "" +"C can imitate C by automatically adding all " +"packages from all sections where the downloaded Packages file lists the " +"package as Priority: important. The default is not to add such packages " +"unless individually included in a C option in a section specified " +"in the C general option. To add all such packages, set the " +"addimportant option to true in the general section." +msgstr "" + +#. type: verbatim +#: pod/multistrap:434 +#, no-wrap +msgid "" +" addimportant=true\n" +"\n" +msgstr "" + +#. type: textblock +#: pod/multistrap:436 +msgid "" +"Priority: important can only operate for all sections listed in the " +"C option. This may cause some confusion when mixing suites." +msgstr "" + #. type: textblock -#: pod/multistrap:421 +#: pod/multistrap:439 msgid "" -"Packages with Priority: important or standard are never included by " -"C unless specifically included in a C option in a " -"section specified in the C general option." +"It is not possible to enable addimportant and omitrequired in the same " +"configuration. C will exit with error code 7 if any " +"configuration results in addimportant and omitrequired both being set to " +"true. (This includes the effects of including other configuration files.)" msgstr "" -"Les paquets marqué avec les niveaux de priorité « important » ou " -"« standard » ne sont jamais inclus par C à moins d'être " -"explicitement fournis par une option C dans une section des " -"options générales de C." #. type: =head1 -#: pod/multistrap:425 +#: pod/multistrap:445 msgid "Recommends behaviour" msgstr "Comportements recommandés" #. type: textblock -#: pod/multistrap:427 +#: pod/multistrap:447 msgid "" "The Debian default behaviour after the Lenny release was to consider " "recommended packages as extra packages to be installed when any one package " @@ -1218,14 +1257,14 @@ msgstr "" "recommandés et ainsi de suite. " #. type: textblock -#: pod/multistrap:434 +#: pod/multistrap:454 msgid "The multistrap default is to turn recommends OFF." msgstr "" "Le comportement par défaut de multistrap est de désactiver les paquets " "recommandés." #. type: textblock -#: pod/multistrap:436 +#: pod/multistrap:456 msgid "" "Set the allowrecommends option to true in the General section to use typical " "Debian behaviour." @@ -1234,12 +1273,12 @@ msgstr "" "(oui) dans la section générale pour utiliser ce comportement usuel de Debian." #. type: =head1 -#: pod/multistrap:439 +#: pod/multistrap:459 msgid "Explicit suite specification" msgstr "Spécification claire de la version de la distribution" #. type: textblock -#: pod/multistrap:441 +#: pod/multistrap:461 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 " @@ -1250,7 +1289,7 @@ msgstr "" "récente d'une autre version de la distribution dans la même liste de sources." #. type: textblock -#: pod/multistrap:445 +#: pod/multistrap:465 msgid "" "C can operate with and without the explicit suite option, the " "default is to let apt use the most recent version from the collection of " @@ -1262,7 +1301,7 @@ msgstr "" "spécifiées." #. type: textblock -#: pod/multistrap:449 +#: pod/multistrap:469 msgid "" "Explicit suite specification has no effect on the final installed system - " "if your aptsources includes a repository which in turn includes a newer " @@ -1275,7 +1314,7 @@ msgstr "" "get upgrade> sur la machine installera la nouvelle version." #. type: textblock -#: pod/multistrap:454 +#: pod/multistrap:474 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 " @@ -1293,7 +1332,7 @@ msgstr "" "également." #. type: textblock -#: pod/multistrap:461 +#: pod/multistrap:481 msgid "" "When using this support in Lenny, ensure that each section uses the suite " "(oldstable, stable, testing, sid) and B the codename (etch, lenny, " @@ -1307,12 +1346,12 @@ msgstr "" "précédentes distributions ne peuvent utiliser le nom de code." #. type: textblock -#: pod/multistrap:466 +#: pod/multistrap:486 msgid "To test, on Lenny, try:" msgstr "Pour tester, sur Lenny essayez :" #. type: verbatim -#: pod/multistrap:468 +#: pod/multistrap:488 #, no-wrap msgid "" " $ sudo apt-get install apt/stable\n" @@ -1322,12 +1361,12 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:470 +#: pod/multistrap:490 msgid "Compare with" msgstr "Comparer avec" #. type: verbatim -#: pod/multistrap:472 +#: pod/multistrap:492 #, no-wrap msgid "" " $ sudo apt-get install apt/lenny\n" @@ -1337,7 +1376,7 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:474 +#: pod/multistrap:494 msgid "" "When using explicitsuite, take care in using stable-proposed-updates or " "other temporary locations - if the package migrates into another suite and " @@ -1346,12 +1385,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:480 +#: pod/multistrap:500 msgid "Omitting deb-src listings" msgstr "Omission de la lecture de deb-src" #. type: textblock -#: pod/multistrap:482 +#: pod/multistrap:502 msgid "" "Some multistrap environments do not need access to the Debian sources of " "packages being installed, typically this is required when preparing a build " @@ -1363,7 +1402,7 @@ msgstr "" "utilisant multistrap." #. type: textblock -#: pod/multistrap:486 +#: pod/multistrap:506 msgid "" "To turn off this additional source (and save both download time and apt-" "cache size), use the omitdebsrc field in each Section." @@ -1373,7 +1412,7 @@ msgstr "" "dans chaque Section." #. type: verbatim -#: pod/multistrap:489 +#: pod/multistrap:509 #, no-wrap msgid "" " [Baked]\n" @@ -1393,19 +1432,19 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:496 +#: pod/multistrap:516 msgid "" "omitdebsrc is necessary when using packages from debian-ports where packages " "do not have sources, except \"unreleased\"." msgstr "" #. type: =head1 -#: pod/multistrap:499 +#: pod/multistrap:519 msgid "fakeroot" msgstr "fakeroot" #. type: textblock -#: pod/multistrap:501 +#: pod/multistrap:521 msgid "" "Foreign architecture bootstraps can operate under C (C " "is designed to do as much as it can within a single call to make this " @@ -1420,7 +1459,7 @@ msgstr "" "C et C en lui même ne fonctionnera pas sous C." #. type: textblock -#: pod/multistrap:507 +#: pod/multistrap:527 msgid "" "Therefore, if C detects that C is in use, native mode " "configuration is skipped with a reminder warning." @@ -1429,7 +1468,7 @@ msgstr "" "le mode de configuration natif est sauté avec un message de rappel." #. type: textblock -#: pod/multistrap:510 +#: pod/multistrap:530 msgid "" "The same problem applies to C and therefore the " "installation of the keyring package on the host system is also skipped if " @@ -1440,12 +1479,12 @@ msgstr "" "détecté." #. type: =head1 -#: pod/multistrap:514 +#: pod/multistrap:534 msgid "Handling problematic packages" msgstr "" #. type: textblock -#: pod/multistrap:516 +#: pod/multistrap:536 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 " @@ -1454,7 +1493,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:521 +#: pod/multistrap:541 msgid "" "Multistrap offers two ways to handle these problems. A package can be listed " "as C or as C. Each section in the C " @@ -1463,7 +1502,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:526 +#: pod/multistrap:546 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 " @@ -1472,7 +1511,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:532 +#: pod/multistrap:552 msgid "" "Additional adds a second round of C to the multistrap " "process - after the initial unpacking. The additional package will then be " @@ -1482,7 +1521,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:538 +#: pod/multistrap:558 msgid "" "Neither C nor C should be seen as more than just " "workarounds and wishlist bugs should be filed in Debian against packages " @@ -1491,12 +1530,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:543 +#: pod/multistrap:563 msgid "Output" msgstr "" #. type: textblock -#: pod/multistrap:545 +#: pod/multistrap:565 msgid "" "C can produce a lot of output - informational messages appear on " "STDOUT, errors and warnings on STDERR. Calls to C and C respect " @@ -1505,12 +1544,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:550 +#: pod/multistrap:570 msgid "Bugs" msgstr "" #. type: textblock -#: pod/multistrap:552 +#: pod/multistrap:572 msgid "" "As C gets more complex, bugs will creep into the package. " "Please report all bugs to the Debian BTS using the C tool and " @@ -1521,14 +1560,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:559 +#: pod/multistrap:579 msgid "" "The C<--simulate> option output is regularly expanded to help users debug " "problems in the configuration files." msgstr "" #. type: textblock -#: pod/multistrap:562 +#: pod/multistrap:582 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/" @@ -1697,6 +1736,16 @@ msgstr "" msgid "See http://wiki.debian.org/DeviceTableScripting" msgstr "Voir http://wiki.debian.org/DeviceTableScripting" +#~ msgid "" +#~ "Packages with Priority: important or standard are never included by " +#~ "C unless specifically included in a C option in a " +#~ "section specified in the C general option." +#~ msgstr "" +#~ "Les paquets marqué avec les niveaux de priorité « important » ou " +#~ "« standard » ne sont jamais inclus par C à moins d'être " +#~ "explicitement fournis par une option C dans une section des " +#~ "options générales de C." + #~ msgid "" #~ "'packages' is the list of packages to be added when this Section is " #~ "listed in C." diff --git a/doc/po/pt.po b/doc/po/pt.po index af3bf4d..8ca0cd1 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.7\n" -"POT-Creation-Date: 2010-12-25 17:21+0000\n" +"POT-Creation-Date: 2011-01-23 00:13+0000\n" "PO-Revision-Date: 2010-09-02 22:47+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -1131,9 +1131,13 @@ msgstr "Restringindo a selecção de pacotes" #. type: textblock #: pod/multistrap:410 +#, fuzzy +#| msgid "" +#| "C includes Required packages by default, the current list of " +#| "packages can be seen using:" msgid "" "C includes Required packages by default, the current list of " -"packages can be seen using:" +"packages on your own machine can be seen using:" msgstr "" "C inclui os pacotes necessários (Required) por predefinição, a " "lista actual de pacotes pode ser vista usando:" @@ -1151,6 +1155,13 @@ msgstr "" #. type: textblock #: pod/multistrap:415 msgid "" +"(The actual list is calculated from the downloaded Packages files and may " +"differ from the output of C.)" +msgstr "" + +#. type: textblock +#: pod/multistrap:418 +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 " "packages specified manually in the configuration files will be used in the " @@ -1162,24 +1173,53 @@ msgstr "" "configuração serão usados nos cálculos - as dependências desses pacotes " "serão adicionadas mas mais nenhuns." +#. type: =head1 +#: pod/multistrap:424 +msgid "Adding Priority: important packages" +msgstr "" + +#. type: textblock +#: pod/multistrap:426 +msgid "" +"C can imitate C by automatically adding all " +"packages from all sections where the downloaded Packages file lists the " +"package as Priority: important. The default is not to add such packages " +"unless individually included in a C option in a section specified " +"in the C general option. To add all such packages, set the " +"addimportant option to true in the general section." +msgstr "" + +#. type: verbatim +#: pod/multistrap:434 +#, no-wrap +msgid "" +" addimportant=true\n" +"\n" +msgstr "" + +#. type: textblock +#: pod/multistrap:436 +msgid "" +"Priority: important can only operate for all sections listed in the " +"C option. This may cause some confusion when mixing suites." +msgstr "" + #. type: textblock -#: pod/multistrap:421 +#: pod/multistrap:439 msgid "" -"Packages with Priority: important or standard are never included by " -"C unless specifically included in a C option in a " -"section specified in the C general option." +"It is not possible to enable addimportant and omitrequired in the same " +"configuration. C will exit with error code 7 if any " +"configuration results in addimportant and omitrequired both being set to " +"true. (This includes the effects of including other configuration files.)" msgstr "" -"Os pacotes com Prioridade importante ou standard nunca são incluídos pelo " -"C a menos que sejam especificamente incluídos numa opção " -"C numa secção especificada na opção geral do C." #. type: =head1 -#: pod/multistrap:425 +#: pod/multistrap:445 msgid "Recommends behaviour" msgstr "Comportamento das recomendações" #. type: textblock -#: pod/multistrap:427 +#: pod/multistrap:447 msgid "" "The Debian default behaviour after the Lenny release was to consider " "recommended packages as extra packages to be installed when any one package " @@ -1195,12 +1235,12 @@ msgstr "" "permitir também as Recomendações de pacotes recomendados e por aí fora." #. type: textblock -#: pod/multistrap:434 +#: pod/multistrap:454 msgid "The multistrap default is to turn recommends OFF." msgstr "A predefinição do multistrap é DESLIGAR as recomendações." #. type: textblock -#: pod/multistrap:436 +#: pod/multistrap:456 msgid "" "Set the allowrecommends option to true in the General section to use typical " "Debian behaviour." @@ -1209,12 +1249,12 @@ msgstr "" "comportamento típico da Debian." #. type: =head1 -#: pod/multistrap:439 +#: pod/multistrap:459 msgid "Explicit suite specification" msgstr "Especificação de suite específica" #. type: textblock -#: pod/multistrap:441 +#: pod/multistrap:461 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 " @@ -1225,7 +1265,7 @@ msgstr "" "mesmo conjunto de fontes." #. type: textblock -#: pod/multistrap:445 +#: pod/multistrap:465 msgid "" "C can operate with and without the explicit suite option, the " "default is to let apt use the most recent version from the collection of " @@ -1236,7 +1276,7 @@ msgstr "" "F especificadas." #. type: textblock -#: pod/multistrap:449 +#: pod/multistrap:469 msgid "" "Explicit suite specification has no effect on the final installed system - " "if your aptsources includes a repository which in turn includes a newer " @@ -1249,7 +1289,7 @@ msgstr "" "C no dispositivo irá trazer a versão mais recente." #. type: textblock -#: pod/multistrap:454 +#: pod/multistrap:474 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 " @@ -1266,7 +1306,7 @@ msgstr "" "necessariamente de todas) das dependências desse pacote também." #. type: textblock -#: pod/multistrap:461 +#: pod/multistrap:481 msgid "" "When using this support in Lenny, ensure that each section uses the suite " "(oldstable, stable, testing, sid) and B the codename (etch, lenny, " @@ -1279,12 +1319,12 @@ msgstr "" "Lenny e anteriores não pode usar o nome de código." #. type: textblock -#: pod/multistrap:466 +#: pod/multistrap:486 msgid "To test, on Lenny, try:" msgstr "Para testar, em Lenny, experimente:" #. type: verbatim -#: pod/multistrap:468 +#: pod/multistrap:488 #, no-wrap msgid "" " $ sudo apt-get install apt/stable\n" @@ -1294,12 +1334,12 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:470 +#: pod/multistrap:490 msgid "Compare with" msgstr "Compare com" #. type: verbatim -#: pod/multistrap:472 +#: pod/multistrap:492 #, no-wrap msgid "" " $ sudo apt-get install apt/lenny\n" @@ -1309,7 +1349,7 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:474 +#: pod/multistrap:494 msgid "" "When using explicitsuite, take care in using stable-proposed-updates or " "other temporary locations - if the package migrates into another suite and " @@ -1318,12 +1358,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:480 +#: pod/multistrap:500 msgid "Omitting deb-src listings" msgstr "Omitir listagens deb-src" #. type: textblock -#: pod/multistrap:482 +#: pod/multistrap:502 msgid "" "Some multistrap environments do not need access to the Debian sources of " "packages being installed, typically this is required when preparing a build " @@ -1335,7 +1375,7 @@ msgstr "" "multistrap." #. type: textblock -#: pod/multistrap:486 +#: pod/multistrap:506 msgid "" "To turn off this additional source (and save both download time and apt-" "cache size), use the omitdebsrc field in each Section." @@ -1344,7 +1384,7 @@ msgstr "" "tamanho da apt-cache), use o campo omitdebsrc em cada Secção." #. type: verbatim -#: pod/multistrap:489 +#: pod/multistrap:509 #, no-wrap msgid "" " [Baked]\n" @@ -1364,19 +1404,19 @@ msgstr "" "\n" #. type: textblock -#: pod/multistrap:496 +#: pod/multistrap:516 msgid "" "omitdebsrc is necessary when using packages from debian-ports where packages " "do not have sources, except \"unreleased\"." msgstr "" #. type: =head1 -#: pod/multistrap:499 +#: pod/multistrap:519 msgid "fakeroot" msgstr "fakeroot" #. type: textblock -#: pod/multistrap:501 +#: pod/multistrap:521 msgid "" "Foreign architecture bootstraps can operate under C (C " "is designed to do as much as it can within a single call to make this " @@ -1391,7 +1431,7 @@ msgstr "" "C e o próprio C não irá operar sob C." #. type: textblock -#: pod/multistrap:507 +#: pod/multistrap:527 msgid "" "Therefore, if C detects that C is in use, native mode " "configuration is skipped with a reminder warning." @@ -1400,7 +1440,7 @@ msgstr "" "configuração de modo nativo é saltada com um aviso de lembrança." #. type: textblock -#: pod/multistrap:510 +#: pod/multistrap:530 msgid "" "The same problem applies to C and therefore the " "installation of the keyring package on the host system is also skipped if " @@ -1411,12 +1451,12 @@ msgstr "" "fakeroot." #. type: =head1 -#: pod/multistrap:514 +#: pod/multistrap:534 msgid "Handling problematic packages" msgstr "" #. type: textblock -#: pod/multistrap:516 +#: pod/multistrap:536 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 " @@ -1425,7 +1465,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:521 +#: pod/multistrap:541 msgid "" "Multistrap offers two ways to handle these problems. A package can be listed " "as C or as C. Each section in the C " @@ -1434,7 +1474,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:526 +#: pod/multistrap:546 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 " @@ -1443,7 +1483,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:532 +#: pod/multistrap:552 msgid "" "Additional adds a second round of C to the multistrap " "process - after the initial unpacking. The additional package will then be " @@ -1453,7 +1493,7 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:538 +#: pod/multistrap:558 msgid "" "Neither C nor C should be seen as more than just " "workarounds and wishlist bugs should be filed in Debian against packages " @@ -1462,12 +1502,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:543 +#: pod/multistrap:563 msgid "Output" msgstr "" #. type: textblock -#: pod/multistrap:545 +#: pod/multistrap:565 msgid "" "C can produce a lot of output - informational messages appear on " "STDOUT, errors and warnings on STDERR. Calls to C and C respect " @@ -1476,12 +1516,12 @@ msgid "" msgstr "" #. type: =head1 -#: pod/multistrap:550 +#: pod/multistrap:570 msgid "Bugs" msgstr "" #. type: textblock -#: pod/multistrap:552 +#: pod/multistrap:572 msgid "" "As C gets more complex, bugs will creep into the package. " "Please report all bugs to the Debian BTS using the C tool and " @@ -1492,14 +1532,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:559 +#: pod/multistrap:579 msgid "" "The C<--simulate> option output is regularly expanded to help users debug " "problems in the configuration files." msgstr "" #. type: textblock -#: pod/multistrap:562 +#: pod/multistrap:582 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/" @@ -1664,6 +1704,15 @@ msgstr "" msgid "See http://wiki.debian.org/DeviceTableScripting" msgstr "Veja http://wiki.debian.org/DeviceTableScripting" +#~ msgid "" +#~ "Packages with Priority: important or standard are never included by " +#~ "C unless specifically included in a C option in a " +#~ "section specified in the C general option." +#~ msgstr "" +#~ "Os pacotes com Prioridade importante ou standard nunca são incluídos pelo " +#~ "C a menos que sejam especificamente incluídos numa opção " +#~ "C numa secção especificada na opção geral do C." + #~ msgid "" #~ "'packages' is the list of packages to be added when this Section is " #~ "listed in C." diff --git a/multistrap b/multistrap index 4d0a976..977e098 100755 --- a/multistrap +++ b/multistrap @@ -33,7 +33,7 @@ use vars qw/ $progname $ourversion $dstrap $extra @aptsources $mirror @extrapkgs @includes %source $setupsh $configsh $omitrequired $dryrun $omitpreinst @reinstall $tgzname %uniq %required $check @check %uniq $explicit_suite $allow_recommends %omitdebsrc @dsclist @sectoutput - %flatfile /; + %flatfile %important $addimportant/; setlocale(LC_MESSAGES, ""); textdomain("multistrap"); @@ -90,6 +90,20 @@ printf (_g("%s %s using %s\n"), $progname, $ourversion, $file); foreach my $inc (@includes) { cascade($inc); } +if (defined $omitrequired and defined $addimportant) { + warn("\n"._g("Error: Cannot set 'add Priority: important' when packages ". + "of 'Priority: required' are being omitted.\n")); + if (scalar @includes > 0) { + my $plural = ngettext("Please also check the included configuration file:", + "Please also check the included configuration files:", scalar @includes); + warn (sprintf("%s '%s'\n", $plural, join ("', '", sort @includes))); + } + if (defined $dryrun) { + warn("\n"); + &dump_config; + } + exit (7); +} %uniq=(); foreach my $line (@debootstrap) { $uniq{$line}++; @@ -313,10 +327,15 @@ die (sprintf (_g("apt update failed. Exit value: %d\n"), ($retval/256))) if ($retval != 0); my @s = (); $str = ""; -if ((not defined $omitrequired) or ($omitrequired eq "false")) { +if (not defined $omitrequired) { print _g("I: Calculating required packages.\n"); &get_required_debs; $str .= join (' ', keys %required); + if (defined $addimportant) { + my $imps = join (' ', sort keys %important); + printf(_g("I: Adding 'Priority: important': %s\n"), $imps); + $str .= " ".$imps; + } chomp($str); } $str .= " "; @@ -712,8 +731,11 @@ sub get_required_debs { next; } next if (not defined $package{'Priority'}); - next unless $package{'Priority'} eq "required"; - $required{$package{'Package'}}++; + if ($package{'Priority'} eq "required") { + $required{$package{'Package'}}++; + } elsif ($package{'Priority'} eq "important") { + $important{$package{'Package'}}++; + } } } } @@ -846,8 +868,8 @@ sub cascade { $setupsh = lc($keys{$section}{'setupscript'}) if (defined $keys{$section}{'setupscript'} and (not defined $setupsh)); undef $setupsh if ((defined $setupsh) and (not -x $setupsh)); - $omitrequired = lc($keys{$section}{'omitrequired'}) - if (defined $keys{$section}{'omitrequired'} and (not defined $omitrequired)); + $omitrequired++ if (defined $keys{$section}{'omitrequired'} and (lc($keys{$section}{'omitrequired'}) eq "true")); + $addimportant++ if (defined $keys{$section}{'addimportant'} and (lc($keys{$section}{'addimportant'}) eq "true")); $omitpreinst = lc($keys{$section}{'omitpreinst'}) if (defined $keys{$section}{'omitpreinst'} and (not defined $omitpreinst)); $tidy++ if ((defined $keys{$section}{'cleanup'}) and ($keys{$section}{'cleanup'} eq "true")); @@ -1040,11 +1062,16 @@ sub dump_config { printf ("unpack:\t\t\t"._g("extract all downloaded archives: %s\n"), $unpack) if (defined $unpack); print "configscript:\t\t$configsh\n" if (defined $configsh); printf ("setupscript:\t\t%s: %s",_g("Script to be run after unpacking"),"$setupsh\n") if (defined $setupsh); - if (defined $omitrequired and $omitrequired ne "false") { + if (defined $omitrequired) { printf ("omitrequired:\t\t%s\n",_g("'Priority required' packages are not included.")); } else { printf ("omitrequired:\t\t%s\n",_g("'Priority: required' packages are included.")); } + if (defined $addimportant) { + printf("addimportant:\t\t"._g("'Priority: important' packages are included.\n")); + } else { + printf("addimportant:\t\t"._g("'Priority: important' packages are ignored.\n")); + } if (defined $tidy) { printf ("cleanup:\t\t"._g("remove apt cache data: true\n")); } else { diff --git a/po/da.po b/po/da.po index b9eba40..e261b19 100644 --- a/po/da.po +++ b/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-12-25 12:18+0000\n" +"POT-Creation-Date: 2011-01-23 00:14+0000\n" "PO-Revision-Date: 2010-09-03 17:30+01:00\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -29,22 +29,35 @@ msgstr "Kræver en konfigurationsfil - brug %s -f\n" #. Translators: fields are programname, version string, include file. #. Translators: fields are: programname, versionstring, configfile. -#: ../multistrap:88 ../multistrap:111 +#: ../multistrap:88 ../multistrap:127 #, perl-format msgid "%s %s using %s\n" msgstr "%s %s ved brug af %s\n" -#: ../multistrap:116 ../multistrap:118 +#: ../multistrap:94 +msgid "" +"Error: Cannot set 'add Priority: important' when packages of 'Priority: " +"required' are being omitted.\n" +msgstr "" + +#: ../multistrap:97 +#, fuzzy +msgid "Please also check the included configuration file:" +msgid_plural "Please also check the included configuration files:" +msgstr[0] "Ingen inkluderede konfigurationsfiler\n" +msgstr[1] "Ingen inkluderede konfigurationsfiler\n" + +#: ../multistrap:132 ../multistrap:134 #, perl-format msgid "Defaulting architecture to native: %s\n" msgstr "Falder tilbage på oprindelig arkitektur: %s\n" -#: ../multistrap:120 +#: ../multistrap:136 #, perl-format msgid "Using foreign architecture: %s\n" msgstr "Bruger fremmed arkitektur: %s\n" -#: ../multistrap:125 +#: ../multistrap:141 #, perl-format msgid "" "No sources defined for a foreign multistrap.\n" @@ -56,80 +69,85 @@ msgstr "" "\tvis dem med aptsources= i '%s'." #. Translators: fields are: programname, architecture, host architecture. -#: ../multistrap:133 +#: ../multistrap:149 #, perl-format msgid "%s building %s multistrap on '%s'\n" msgstr "%s bygger %s multistrap på '%s'\n" -#: ../multistrap:135 +#: ../multistrap:151 msgid "No directory specified!" msgstr "" -#: ../multistrap:141 +#: ../multistrap:157 #, perl-format msgid "Unable to create directory '%s'" msgstr "Kunne ikke oprette mappe '%s'" -#: ../multistrap:192 +#: ../multistrap:207 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "INF: ./lib64 -> /lib symbolsk henvisning nulstil til ./lib.\n" -#: ../multistrap:200 +#: ../multistrap:215 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n" msgstr "INF: Setting ./lib64 -> ./lib symbolic link.\n" -#: ../multistrap:229 ../multistrap:234 ../multistrap:385 ../multistrap:390 +#: ../multistrap:244 ../multistrap:249 ../multistrap:404 ../multistrap:409 msgid "Cannot open sources list" msgstr "Kan ikke åbne kildeliste" -#: ../multistrap:253 +#: ../multistrap:268 #, perl-format msgid "I: Installing %s\n" msgstr "I: Installerer %s\n" -#: ../multistrap:268 +#: ../multistrap:283 #, perl-format msgid "Unable to download keyring package: '%s'" msgstr "" -#: ../multistrap:288 +#: ../multistrap:303 msgid "Secure Apt handling failed - try without authentication." msgstr "" -#: ../multistrap:311 +#: ../multistrap:326 #, perl-format msgid "Getting package lists: apt-get %s update\n" msgstr "Henter pakkelister: apt-get %s opdater\n" -#: ../multistrap:313 +#: ../multistrap:328 #, perl-format msgid "apt update failed. Exit value: %d\n" msgstr "apt update mislykkedes. Afslutningsværdi: %d\n" -#: ../multistrap:318 +#: ../multistrap:333 msgid "I: Calculating required packages.\n" msgstr "I: Kalkulerer krævede pakker.\n" -#: ../multistrap:354 +#: ../multistrap:338 +#, perl-format +msgid "I: Adding 'Priority: important': %s\n" +msgstr "" + +#: ../multistrap:374 #, perl-format msgid "apt download failed. Exit value: %d\n" msgstr "apt-hentning mislykkedes. Afslutningsværdi: %d\n" -#: ../multistrap:367 +#: ../multistrap:386 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:368 +#: ../multistrap:387 #, 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:375 +#: ../multistrap:394 msgid "Cannot read apt sources list directory.\n" msgstr "Kan ikke læse apt-kildernes listemappe.\n" -#: ../multistrap:404 +#: ../multistrap:423 #, perl-format msgid "" "\n" @@ -138,7 +156,7 @@ msgstr "" "\n" "Multistrap system installeret i %s.\n" -#: ../multistrap:406 +#: ../multistrap:425 #, perl-format msgid "" "\n" @@ -147,7 +165,7 @@ msgstr "" "\n" "Pakker multistrap system i '%s' til en tarball kaldt: '%s'.\n" -#: ../multistrap:412 +#: ../multistrap:431 #, perl-format msgid "" "\n" @@ -156,7 +174,7 @@ msgstr "" "\n" "Fjerner kompileringsmappe: '%s'\n" -#: ../multistrap:417 +#: ../multistrap:436 #, perl-format msgid "" "\n" @@ -165,30 +183,30 @@ msgstr "" "\n" "Multistrap system pakket som '%s'.\n" -#: ../multistrap:443 ../multistrap:484 ../multistrap:637 +#: ../multistrap:462 ../multistrap:503 ../multistrap:656 msgid "Cannot read apt archives directory.\n" msgstr "Kan ikke læse apt-arkivets mappe.\n" -#: ../multistrap:456 +#: ../multistrap:475 msgid "I: Calculating obsolete packages\n" msgstr "I: Kalkulerer forældede pakker\n" -#: ../multistrap:470 ../multistrap:474 +#: ../multistrap:489 ../multistrap:493 #, perl-format msgid "I: Removing %s\n" msgstr "I: Fjerner %s\n" -#: ../multistrap:491 +#: ../multistrap:510 #, perl-format msgid "Using directory %s for unpacking operations\n" msgstr "Bruger mappe %s til udpakningshandlinger\n" -#: ../multistrap:493 +#: ../multistrap:512 #, perl-format msgid "I: Extracting %s...\n" msgstr "I: Udpakker %s...\n" -#: ../multistrap:506 +#: ../multistrap:525 #, perl-format msgid "" "dpkg -X failed with error code %s\n" @@ -197,49 +215,49 @@ msgstr "" "dpkg -X mislykkedes med fejlkode %s\n" "Springer over...\n" -#: ../multistrap:542 +#: ../multistrap:561 #, perl-format msgid " -> Processing conffiles for %s\n" msgstr " -> Behandler conffiler for %s\n" -#: ../multistrap:561 +#: ../multistrap:580 #, perl-format msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n" msgstr "ERR: lib64 -> ./lib symbolsk henvisning knust af %s\n" -#: ../multistrap:564 +#: ../multistrap:583 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "INF: lib64 -> /lib symbolsk henvisning nulstil til ./lib.\n" -#: ../multistrap:571 +#: ../multistrap:590 msgid "I: Unpacking complete.\n" msgstr "I: Udpakning færdig.\n" -#: ../multistrap:584 +#: ../multistrap:603 msgid "ERR: ./bin/sh symbolic link does not exist.\n" msgstr "ERR: ./bin/sh symbolsk henvisning eksisterer ikke.\n" -#: ../multistrap:586 +#: ../multistrap:605 msgid "INF: Setting ./bin/sh -> ./bin/dash\n" msgstr "INF: Indstiller ./bin/sh -> ./bin/dash\n" -#: ../multistrap:591 +#: ../multistrap:610 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:606 +#: ../multistrap:625 msgid "I: Tidying up apt cache and list data.\n" msgstr "I: Rydder op i apt-mellemlager og listedata.\n" -#: ../multistrap:619 +#: ../multistrap:638 msgid "Cannot read apt lists directory.\n" msgstr "Kan ikke læse apt-listemapper.\n" -#: ../multistrap:627 +#: ../multistrap:646 msgid "Cannot read apt cache directory.\n" msgstr "Kan ikke læse apt-mellemlagermappe.\n" -#: ../multistrap:659 +#: ../multistrap:678 #, perl-format msgid "" "I: dpkg configuration settings:\n" @@ -248,7 +266,7 @@ msgstr "" "I: Opsætning af dpkg-konfiguration:\n" "\t%s\n" -#: ../multistrap:661 +#: ../multistrap:680 msgid "" "W: Cannot use 'chroot' when fakeroot is in use. Skipping package " "configuration.\n" @@ -256,35 +274,35 @@ msgstr "" "W: Kan ikke bruge 'chroot' når fakeroot er i brug. Springer " "pakkekonfiguration over.\n" -#: ../multistrap:664 +#: ../multistrap:683 msgid "I: Native mode - configuring unpacked packages . . .\n" msgstr "I: Standardtilstand - konfigurerer upakkede pakker...\n" -#: ../multistrap:675 +#: ../multistrap:694 msgid "I: Running preinst scripts with 'upgrade' argument.\n" msgstr "I: Kører preinst-skripter med argumentet 'upgrade'.\n" -#: ../multistrap:698 +#: ../multistrap:717 #, perl-format msgid "Cannot open %s directory. %s\n" msgstr "Kan ikke åben mappen %s. %s\n" -#: ../multistrap:729 +#: ../multistrap:751 #, perl-format msgid "cannot open apt sources list. %s" msgstr "kan ikke åbne apt-kildeliste. %s" -#: ../multistrap:735 +#: ../multistrap:757 #, perl-format msgid "cannot open apt sources.list directory %s\n" msgstr "kan ikke åbne apt-sources-list-mappe %s\n" -#: ../multistrap:740 +#: ../multistrap:762 #, perl-format msgid "cannot open /etc/apt/sources.list.d/%s %s" msgstr "kan ikke åbne /etc/apt/sources.list.d/%s %s" -#: ../multistrap:752 +#: ../multistrap:774 #, fuzzy, perl-format msgid "" "\n" @@ -420,21 +438,21 @@ msgstr "" "hvis den ikke pakkes ind i en .tgz når den først er færdig.\n" "\n" -#: ../multistrap:818 +#: ../multistrap:840 msgid "failed to write usage:" msgstr "kunne ikke skrive brug:" -#: ../multistrap:825 +#: ../multistrap:847 #, perl-format msgid "Failed to parse '%s'!\n" msgstr "" -#: ../multistrap:879 +#: ../multistrap:901 #, perl-format msgid "ERR: Cannot find include file: '%s' for '%s'" msgstr "" -#: ../multistrap:929 +#: ../multistrap:951 #, perl-format msgid "" "ERROR: Your version of apt is too old to support using a codename like '%s'. " @@ -450,132 +468,141 @@ msgstr "" "'unstable' eller 'experimental'. Alternativt kan du opgradere til en version " "af apt, der er nyere end 0.7.20.2+lenny1.\n" -#: ../multistrap:949 +#: ../multistrap:971 #, perl-format msgid "The supplied configuration file '%s' cannot be parsed correctly." msgstr "Den angivne konfigurationsfil '%s' kan ikke fortolkes korrekt." -#: ../multistrap:963 +#: ../multistrap:985 #, perl-format msgid "ERR: The '%s' section is not defined.\n" msgstr "FEJL: Afsnittet '%s' er ikke defineret.\n" -#: ../multistrap:967 +#: ../multistrap:989 #, fuzzy msgid "Including configuration file from:" msgid_plural "Including configuration files from:" msgstr[0] "Inklusiv konfigurationsfil fra: " msgstr[1] "Inklusiv konfigurationsfil fra: " -#: ../multistrap:971 +#: ../multistrap:993 msgid "No included configuration files.\n" msgstr "Ingen inkluderede konfigurationsfiler\n" -#: ../multistrap:992 +#: ../multistrap:1014 msgid "Not listed as a 'Bootstrap' section." msgstr "" -#: ../multistrap:999 +#: ../multistrap:1021 msgid "Section to install" msgid_plural "Sections to install" msgstr[0] "" msgstr[1] "" -#: ../multistrap:1001 +#: ../multistrap:1023 msgid "Section for updates" msgid_plural "Sections for updates" msgstr[0] "" msgstr[1] "" -#: ../multistrap:1008 +#: ../multistrap:1030 msgid "Omit deb-src from sources.list for sections:" msgstr "Udelad deb-src fra sources.list for afsnit:" -#: ../multistrap:1010 +#: ../multistrap:1032 msgid "None." msgstr "" -#: ../multistrap:1018 +#: ../multistrap:1040 msgid "Explicit suite selection: Yes\n" msgstr "Eksplicit programpakkevalg: Ja\n" -#: ../multistrap:1020 +#: ../multistrap:1042 msgid "Explicit suite selection: No - let apt use latest.\n" msgstr "Eksplicit programvalg: Nej - lad apt bruge seneste.\n" -#: ../multistrap:1023 +#: ../multistrap:1045 msgid "Recommended packages are added to the selection.\n" msgstr "Anbefalede pakker tilføjes til valget.\n" -#: ../multistrap:1025 +#: ../multistrap:1047 msgid "Recommended packages are ignored.\n" msgstr "Anbefalede pakker ignoreres.\n" -#: ../multistrap:1027 +#: ../multistrap:1049 msgid "Extra Package: " msgid_plural "Extra Packages: " msgstr[0] "" msgstr[1] "" -#: ../multistrap:1033 +#: ../multistrap:1055 #, fuzzy, perl-format msgid "Architecture to download: %s\n" msgstr "Arkitektur: %s\n" -#: ../multistrap:1035 +#: ../multistrap:1057 #, perl-format msgid "Cannot determine architecture from '%s'.\n" msgstr "Kan ikke bestemme arkitektur fra '%s'.\n" -#: ../multistrap:1038 +#: ../multistrap:1060 #, perl-format msgid "Output directory: '%s'\n" msgstr "Uddatamappe: '%s'\n" -#: ../multistrap:1040 +#: ../multistrap:1062 #, perl-format msgid "Cannot determine directory from '%s'.\n" msgstr "Kan ikke bestemme mappe fra '%s'.\n" -#: ../multistrap:1042 +#: ../multistrap:1064 #, perl-format msgid "extract all downloaded archives: %s\n" msgstr "udtræk alle hentede arkiver: %s\n" -#: ../multistrap:1044 +#: ../multistrap:1066 msgid "Script to be run after unpacking" msgstr "" -#: ../multistrap:1046 +#: ../multistrap:1068 msgid "'Priority required' packages are not included." msgstr "" -#: ../multistrap:1048 +#: ../multistrap:1070 msgid "'Priority: required' packages are included." msgstr "" -#: ../multistrap:1051 +#: ../multistrap:1073 +msgid "'Priority: important' packages are included.\n" +msgstr "" + +#: ../multistrap:1075 +#, fuzzy +msgid "'Priority: important' packages are ignored.\n" +msgstr "Anbefalede pakker ignoreres.\n" + +#: ../multistrap:1078 msgid "remove apt cache data: true\n" msgstr "fjern apt-mellemlagerdata: true\n" -#: ../multistrap:1053 +#: ../multistrap:1080 msgid "remove apt cache data: false\n" msgstr "fjern apt-mellemlagerdata: false\n" -#: ../multistrap:1056 +#: ../multistrap:1083 msgid "allow the use of unauthenticated repositories: true\n" msgstr "tillad brugen af arkiver der ikke er godkendte: true\n" -#: ../multistrap:1058 +#: ../multistrap:1085 msgid "allow the use of unauthenticated repositories: false\n" msgstr "tillad brugen af arkiver der ikke ikke er godkendte: false\n" -#: ../multistrap:1061 +#: ../multistrap:1088 #, perl-format msgid "Sources will be retained in: %s\n" msgstr "Kilder vil blive bevaret i: %s\n" -#: ../multistrap:1064 +#: ../multistrap:1091 #, perl-format msgid "Tarball name: '%s'\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 8ad990d..86da9f0 100644 --- 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-12-25 12:18+0000\n" +"POT-Creation-Date: 2011-01-23 00:14+0000\n" "PO-Revision-Date: 2010-09-26 21:07+0200\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -30,22 +30,35 @@ msgstr "" #. Translators: fields are programname, version string, include file. #. Translators: fields are: programname, versionstring, configfile. -#: ../multistrap:88 ../multistrap:111 +#: ../multistrap:88 ../multistrap:127 #, perl-format msgid "%s %s using %s\n" msgstr "%s %s utilise %s\n" -#: ../multistrap:116 ../multistrap:118 +#: ../multistrap:94 +msgid "" +"Error: Cannot set 'add Priority: important' when packages of 'Priority: " +"required' are being omitted.\n" +msgstr "" + +#: ../multistrap:97 +#, fuzzy +msgid "Please also check the included configuration file:" +msgid_plural "Please also check the included configuration files:" +msgstr[0] "Pas de fichier de configuration inclus.\n" +msgstr[1] "Pas de fichier de configuration inclus.\n" + +#: ../multistrap:132 ../multistrap:134 #, perl-format msgid "Defaulting architecture to native: %s\n" msgstr "Utilisation de l'architecture native %s\n" -#: ../multistrap:120 +#: ../multistrap:136 #, perl-format msgid "Using foreign architecture: %s\n" msgstr "Utilisation de l'architecture %s\n" -#: ../multistrap:125 +#: ../multistrap:141 #, perl-format msgid "" "No sources defined for a foreign multistrap.\n" @@ -57,82 +70,87 @@ msgstr "" "\tsources différentes, listez les avec aptsources= dans « %s »." #. Translators: fields are: programname, architecture, host architecture. -#: ../multistrap:133 +#: ../multistrap:149 #, perl-format msgid "%s building %s multistrap on '%s'\n" msgstr "%s construit un multistrap pour l'architecture « %s » sur « %s »\n" -#: ../multistrap:135 +#: ../multistrap:151 msgid "No directory specified!" msgstr "" -#: ../multistrap:141 +#: ../multistrap:157 #, perl-format msgid "Unable to create directory '%s'" msgstr "Impossible de créer le répertoire « %s »" -#: ../multistrap:192 +#: ../multistrap:207 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "" "INF : le lien symbolique ./lib64 -> /lib pointe maintenant vers ./lib.\n" -#: ../multistrap:200 +#: ../multistrap:215 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n" msgstr "INF : définition du lien symbolique ./lib64 -> ./lib.\n" -#: ../multistrap:229 ../multistrap:234 ../multistrap:385 ../multistrap:390 +#: ../multistrap:244 ../multistrap:249 ../multistrap:404 ../multistrap:409 msgid "Cannot open sources list" msgstr "Impossible d'ouvrir la liste des sources" -#: ../multistrap:253 +#: ../multistrap:268 #, perl-format msgid "I: Installing %s\n" msgstr "I : installation de %s\n" -#: ../multistrap:268 +#: ../multistrap:283 #, perl-format msgid "Unable to download keyring package: '%s'" msgstr "" -#: ../multistrap:288 +#: ../multistrap:303 msgid "Secure Apt handling failed - try without authentication." msgstr "" -#: ../multistrap:311 +#: ../multistrap:326 #, 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:313 +#: ../multistrap:328 #, perl-format msgid "apt update failed. Exit value: %d\n" msgstr "Échec de la mise à jour apt. Code de sortie : %d\n" -#: ../multistrap:318 +#: ../multistrap:333 msgid "I: Calculating required packages.\n" msgstr "I : prise en compte des paquets requis.\n" -#: ../multistrap:354 +#: ../multistrap:338 +#, perl-format +msgid "I: Adding 'Priority: important': %s\n" +msgstr "" + +#: ../multistrap:374 #, perl-format msgid "apt download failed. Exit value: %d\n" msgstr "Échec du téléchargement apt. Code de sortie : %d\n" -#: ../multistrap:367 +#: ../multistrap:386 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:368 +#: ../multistrap:387 #, 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:375 +#: ../multistrap:394 msgid "Cannot read apt sources list directory.\n" msgstr "Impossible de lire le répertoire des sources d'apt.\n" -#: ../multistrap:404 +#: ../multistrap:423 #, perl-format msgid "" "\n" @@ -141,7 +159,7 @@ msgstr "" "\n" "Système multistrap installé avec succès dans %s.\n" -#: ../multistrap:406 +#: ../multistrap:425 #, perl-format msgid "" "\n" @@ -151,7 +169,7 @@ msgstr "" "Compression du système multistrap se trouvant dans « %s » dans une archive " "tar nommée : « %s ».\n" -#: ../multistrap:412 +#: ../multistrap:431 #, perl-format msgid "" "\n" @@ -160,7 +178,7 @@ msgstr "" "\n" "Suppression du répertoire de compilation : « %s »\n" -#: ../multistrap:417 +#: ../multistrap:436 #, perl-format msgid "" "\n" @@ -169,30 +187,30 @@ msgstr "" "\n" "Système multistrap empaqueté avec succès dans « %s ».\n" -#: ../multistrap:443 ../multistrap:484 ../multistrap:637 +#: ../multistrap:462 ../multistrap:503 ../multistrap:656 msgid "Cannot read apt archives directory.\n" msgstr "Impossible d'accéder au répertoire des archives apt.\n" -#: ../multistrap:456 +#: ../multistrap:475 msgid "I: Calculating obsolete packages\n" msgstr "I : identification des paquets obsolètes\n" -#: ../multistrap:470 ../multistrap:474 +#: ../multistrap:489 ../multistrap:493 #, perl-format msgid "I: Removing %s\n" msgstr "I : suppression de %s\n" -#: ../multistrap:491 +#: ../multistrap:510 #, 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:493 +#: ../multistrap:512 #, perl-format msgid "I: Extracting %s...\n" msgstr "I : extraction de %s...\n" -#: ../multistrap:506 +#: ../multistrap:525 #, perl-format msgid "" "dpkg -X failed with error code %s\n" @@ -201,51 +219,51 @@ msgstr "" "dpkg -X a échoué avec le code d'erreur %s\n" "Annulation...\n" -#: ../multistrap:542 +#: ../multistrap:561 #, perl-format msgid " -> Processing conffiles for %s\n" msgstr " -> Traitement des fichiers de configuration pour %s\n" -#: ../multistrap:561 +#: ../multistrap:580 #, 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:564 +#: ../multistrap:583 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "INF : le lien symbolique lib64 -> /lib pointe maintenant vers ./lib.\n" -#: ../multistrap:571 +#: ../multistrap:590 msgid "I: Unpacking complete.\n" msgstr "I : dépaquetage terminé.\n" -#: ../multistrap:584 +#: ../multistrap:603 msgid "ERR: ./bin/sh symbolic link does not exist.\n" msgstr "ERR : le lien symbolique ./bin/sh n'existe pas.\n" -#: ../multistrap:586 +#: ../multistrap:605 msgid "INF: Setting ./bin/sh -> ./bin/dash\n" msgstr "INF : définition du lien symbolique ./bin/sh -> ./bin/dash\n" -#: ../multistrap:591 +#: ../multistrap:610 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:606 +#: ../multistrap:625 msgid "I: Tidying up apt cache and list data.\n" msgstr "I : nettoyage du cache apt et des listes de données.\n" -#: ../multistrap:619 +#: ../multistrap:638 msgid "Cannot read apt lists directory.\n" msgstr "Impossible d'accéder au répertoire des listes apt.\n" -#: ../multistrap:627 +#: ../multistrap:646 msgid "Cannot read apt cache directory.\n" msgstr "Impossible d'accéder au répertoire du cache apt.\n" -#: ../multistrap:659 +#: ../multistrap:678 #, perl-format msgid "" "I: dpkg configuration settings:\n" @@ -254,7 +272,7 @@ msgstr "" "I : paramètres de configuration de dpkg :\n" "\t%s\n" -#: ../multistrap:661 +#: ../multistrap:680 msgid "" "W: Cannot use 'chroot' when fakeroot is in use. Skipping package " "configuration.\n" @@ -264,37 +282,37 @@ msgstr "" # msgid "Cannot read apt archives directory.\n # msgstr "Impossible d'accéder au répertoire des archives apt.\n -#: ../multistrap:664 +#: ../multistrap:683 msgid "I: Native mode - configuring unpacked packages . . .\n" msgstr "I : mode natif, configure les paquets décompressés...\n" -#: ../multistrap:675 +#: ../multistrap:694 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:698 +#: ../multistrap:717 #, perl-format msgid "Cannot open %s directory. %s\n" msgstr "Impossible d'accéder au répertoire %s. %s\n" -#: ../multistrap:729 +#: ../multistrap:751 #, perl-format msgid "cannot open apt sources list. %s" msgstr "Impossible d'accéder à la liste des sources apt. %s" -#: ../multistrap:735 +#: ../multistrap:757 #, 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:740 +#: ../multistrap:762 #, 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:752 +#: ../multistrap:774 #, fuzzy, perl-format msgid "" "\n" @@ -438,21 +456,21 @@ msgstr "" "sera créé. Il n'est pas empaqueté dans un .tgz une fois fini.\n" "\n" -#: ../multistrap:818 +#: ../multistrap:840 msgid "failed to write usage:" msgstr "Impossible d'afficher l'aide :" -#: ../multistrap:825 +#: ../multistrap:847 #, perl-format msgid "Failed to parse '%s'!\n" msgstr "" -#: ../multistrap:879 +#: ../multistrap:901 #, perl-format msgid "ERR: Cannot find include file: '%s' for '%s'" msgstr "" -#: ../multistrap:929 +#: ../multistrap:951 #, perl-format msgid "" "ERROR: Your version of apt is too old to support using a codename like '%s'. " @@ -469,135 +487,144 @@ msgstr "" "experimental ». Vous pouvez également mettre à jour apt vers une version " "plus récente que 0.7.20.2+lenny1.\n" -#: ../multistrap:949 +#: ../multistrap:971 #, 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:963 +#: ../multistrap:985 #, perl-format msgid "ERR: The '%s' section is not defined.\n" msgstr "ERR : la section « %s » n'est pas définie.\n" -#: ../multistrap:967 +#: ../multistrap:989 #, fuzzy msgid "Including configuration file from:" msgid_plural "Including configuration files from:" msgstr[0] "Inclusion du fichier de configuration depuis : " msgstr[1] "Inclusion du fichier de configuration depuis : " -#: ../multistrap:971 +#: ../multistrap:993 msgid "No included configuration files.\n" msgstr "Pas de fichier de configuration inclus.\n" -#: ../multistrap:992 +#: ../multistrap:1014 msgid "Not listed as a 'Bootstrap' section." msgstr "" -#: ../multistrap:999 +#: ../multistrap:1021 msgid "Section to install" msgid_plural "Sections to install" msgstr[0] "" msgstr[1] "" -#: ../multistrap:1001 +#: ../multistrap:1023 msgid "Section for updates" msgid_plural "Sections for updates" msgstr[0] "" msgstr[1] "" -#: ../multistrap:1008 +#: ../multistrap:1030 msgid "Omit deb-src from sources.list for sections:" msgstr "Omission de deb-src dans sources.list pour les sections : " -#: ../multistrap:1010 +#: ../multistrap:1032 msgid "None." msgstr "" -#: ../multistrap:1018 +#: ../multistrap:1040 msgid "Explicit suite selection: Yes\n" msgstr "Sélection des versions explicites : Oui\n" -#: ../multistrap:1020 +#: ../multistrap:1042 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:1023 +#: ../multistrap:1045 msgid "Recommended packages are added to the selection.\n" msgstr "Les paquets recommandés sont ajoutés à la sélection.\n" -#: ../multistrap:1025 +#: ../multistrap:1047 msgid "Recommended packages are ignored.\n" msgstr "Les paquets recommandés sont ignorés.\n" -#: ../multistrap:1027 +#: ../multistrap:1049 msgid "Extra Package: " msgid_plural "Extra Packages: " msgstr[0] "" msgstr[1] "" -#: ../multistrap:1033 +#: ../multistrap:1055 #, fuzzy, perl-format msgid "Architecture to download: %s\n" msgstr "Architecture : %s\n" -#: ../multistrap:1035 +#: ../multistrap:1057 #, perl-format msgid "Cannot determine architecture from '%s'.\n" msgstr "Impossible de déterminer l'architecture depuis « %s ».\n" -#: ../multistrap:1038 +#: ../multistrap:1060 #, perl-format msgid "Output directory: '%s'\n" msgstr "Répertoire de sortie : « %s »\n" -#: ../multistrap:1040 +#: ../multistrap:1062 #, perl-format msgid "Cannot determine directory from '%s'.\n" msgstr "Impossible de déterminer le répertoire depuis « %s ».\n" -#: ../multistrap:1042 +#: ../multistrap:1064 #, perl-format msgid "extract all downloaded archives: %s\n" msgstr "extrait toutes les archives téléchargées : %s\n" -#: ../multistrap:1044 +#: ../multistrap:1066 msgid "Script to be run after unpacking" msgstr "" -#: ../multistrap:1046 +#: ../multistrap:1068 msgid "'Priority required' packages are not included." msgstr "" -#: ../multistrap:1048 +#: ../multistrap:1070 msgid "'Priority: required' packages are included." msgstr "" -#: ../multistrap:1051 +#: ../multistrap:1073 +msgid "'Priority: important' packages are included.\n" +msgstr "" + +#: ../multistrap:1075 +#, fuzzy +msgid "'Priority: important' packages are ignored.\n" +msgstr "Les paquets recommandés sont ignorés.\n" + +#: ../multistrap:1078 msgid "remove apt cache data: true\n" msgstr "supprime les données du cache d'apt : oui\n" -#: ../multistrap:1053 +#: ../multistrap:1080 msgid "remove apt cache data: false\n" msgstr "supprime les données du cache d'apt : non\n" -#: ../multistrap:1056 +#: ../multistrap:1083 msgid "allow the use of unauthenticated repositories: true\n" msgstr "autorise l'utilisation de dépôts non signés : oui\n" -#: ../multistrap:1058 +#: ../multistrap:1085 msgid "allow the use of unauthenticated repositories: false\n" msgstr "autorise l'utilisation de dépôts non signés : non\n" -#: ../multistrap:1061 +#: ../multistrap:1088 #, perl-format msgid "Sources will be retained in: %s\n" msgstr "Les sources seront conservées dans : %s\n" -#: ../multistrap:1064 +#: ../multistrap:1091 #, perl-format msgid "Tarball name: '%s'\n" msgstr "" diff --git a/po/pt.po b/po/pt.po index 9cb39b8..9d3ee94 100644 --- a/po/pt.po +++ b/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-12-25 12:18+0000\n" +"POT-Creation-Date: 2011-01-23 00:14+0000\n" "PO-Revision-Date: 2010-09-12 23:50+0100\n" "Last-Translator: Pedro Ribeiro \n" "Language-Team: Portuguese \n" @@ -27,22 +27,35 @@ msgstr "É necessário um ficheiro de configuração - use %s -f\n" #. Translators: fields are programname, version string, include file. #. Translators: fields are: programname, versionstring, configfile. -#: ../multistrap:88 ../multistrap:111 +#: ../multistrap:88 ../multistrap:127 #, perl-format msgid "%s %s using %s\n" msgstr "%s %s a usar %s\n" -#: ../multistrap:116 ../multistrap:118 +#: ../multistrap:94 +msgid "" +"Error: Cannot set 'add Priority: important' when packages of 'Priority: " +"required' are being omitted.\n" +msgstr "" + +#: ../multistrap:97 +#, fuzzy +msgid "Please also check the included configuration file:" +msgid_plural "Please also check the included configuration files:" +msgstr[0] "Não foram incluídos ficheiros de configuração.\n" +msgstr[1] "Não foram incluídos ficheiros de configuração.\n" + +#: ../multistrap:132 ../multistrap:134 #, perl-format msgid "Defaulting architecture to native: %s\n" msgstr "A usar como padrão a arquitectura nativa: %s\n" -#: ../multistrap:120 +#: ../multistrap:136 #, perl-format msgid "Using foreign architecture: %s\n" msgstr "A usar arquitectura estrangeira: %s\n" -#: ../multistrap:125 +#: ../multistrap:141 #, perl-format msgid "" "No sources defined for a foreign multistrap.\n" @@ -54,81 +67,86 @@ msgstr "" "\tliste-as com aptsources= em '%s'." #. Translators: fields are: programname, architecture, host architecture. -#: ../multistrap:133 +#: ../multistrap:149 #, perl-format msgid "%s building %s multistrap on '%s'\n" msgstr "%s a criar multistrap para %s em '%s'\n" -#: ../multistrap:135 +#: ../multistrap:151 msgid "No directory specified!" msgstr "" -#: ../multistrap:141 +#: ../multistrap:157 #, perl-format msgid "Unable to create directory '%s'" msgstr "Não foi possível criar o directório '%s'" -#: ../multistrap:192 +#: ../multistrap:207 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "INF: link simbólico ./lib64 -> /lib reposto para ./lib.\n" -#: ../multistrap:200 +#: ../multistrap:215 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n" msgstr "INF: A definir link simbólico ./lib64 -> ./lib.\n" -#: ../multistrap:229 ../multistrap:234 ../multistrap:385 ../multistrap:390 +#: ../multistrap:244 ../multistrap:249 ../multistrap:404 ../multistrap:409 msgid "Cannot open sources list" msgstr "Impossível abrir lista de fontes" -#: ../multistrap:253 +#: ../multistrap:268 #, perl-format msgid "I: Installing %s\n" msgstr "I: A instalar %s\n" -#: ../multistrap:268 +#: ../multistrap:283 #, perl-format msgid "Unable to download keyring package: '%s'" msgstr "" -#: ../multistrap:288 +#: ../multistrap:303 msgid "Secure Apt handling failed - try without authentication." msgstr "" -#: ../multistrap:311 +#: ../multistrap:326 #, perl-format msgid "Getting package lists: apt-get %s update\n" msgstr "A obter listas de pacotes: apt-get %s update\n" -#: ../multistrap:313 +#: ../multistrap:328 #, perl-format msgid "apt update failed. Exit value: %d\n" msgstr "apt update falhou. Valor de saída: %d\n" -#: ../multistrap:318 +#: ../multistrap:333 msgid "I: Calculating required packages.\n" msgstr "I: A calcular pacotes necessários\n" -#: ../multistrap:354 +#: ../multistrap:338 +#, perl-format +msgid "I: Adding 'Priority: important': %s\n" +msgstr "" + +#: ../multistrap:374 #, perl-format msgid "apt download failed. Exit value: %d\n" msgstr "apt download falhou. Valor de saída: %d\n" -#: ../multistrap:367 +#: ../multistrap:386 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:368 +#: ../multistrap:387 #, 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:375 +#: ../multistrap:394 msgid "Cannot read apt sources list directory.\n" msgstr "Impossível ler directório de listas de fontes apt.\n" -#: ../multistrap:404 +#: ../multistrap:423 #, perl-format msgid "" "\n" @@ -137,7 +155,7 @@ msgstr "" "\n" "Sistema multistrap instalado com sucesso em %s.\n" -#: ../multistrap:406 +#: ../multistrap:425 #, perl-format msgid "" "\n" @@ -147,7 +165,7 @@ msgstr "" "A comprimir o sistema multistrap em '%s' para um ficheiro tar chamado: " "'%s'.\n" -#: ../multistrap:412 +#: ../multistrap:431 #, perl-format msgid "" "\n" @@ -156,7 +174,7 @@ msgstr "" "\n" "A remover directório de criação: '%s'\n" -#: ../multistrap:417 +#: ../multistrap:436 #, perl-format msgid "" "\n" @@ -165,30 +183,30 @@ msgstr "" "\n" "Sistema multistrap empacotado com sucesso como '%s'.\n" -#: ../multistrap:443 ../multistrap:484 ../multistrap:637 +#: ../multistrap:462 ../multistrap:503 ../multistrap:656 msgid "Cannot read apt archives directory.\n" msgstr "Impossível ler o directório de arquivos apt.\n" -#: ../multistrap:456 +#: ../multistrap:475 msgid "I: Calculating obsolete packages\n" msgstr "I: A calcular pacotes obsoletos\n" -#: ../multistrap:470 ../multistrap:474 +#: ../multistrap:489 ../multistrap:493 #, perl-format msgid "I: Removing %s\n" msgstr "I: A remover %s\n" -#: ../multistrap:491 +#: ../multistrap:510 #, perl-format msgid "Using directory %s for unpacking operations\n" msgstr "A usar o directório %s para operações de desempacotamento\n" -#: ../multistrap:493 +#: ../multistrap:512 #, perl-format msgid "I: Extracting %s...\n" msgstr "I: A extrair %s...\n" -#: ../multistrap:506 +#: ../multistrap:525 #, perl-format msgid "" "dpkg -X failed with error code %s\n" @@ -197,49 +215,49 @@ msgstr "" "dpkg -X falhou com o código de erro %s\n" "A saltar....\n" -#: ../multistrap:542 +#: ../multistrap:561 #, perl-format msgid " -> Processing conffiles for %s\n" msgstr " -> A processar ficheiros de configuração para %s\n" -#: ../multistrap:561 +#: ../multistrap:580 #, perl-format msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n" msgstr "ERRO: link simbólico lib64 -> ./lib ocultado por %s\n" -#: ../multistrap:564 +#: ../multistrap:583 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "INF: link simbólico lib64 -> /lib reposto para ./lib.\n" -#: ../multistrap:571 +#: ../multistrap:590 msgid "I: Unpacking complete.\n" msgstr "I: Desempacotamento completo.\n" -#: ../multistrap:584 +#: ../multistrap:603 msgid "ERR: ./bin/sh symbolic link does not exist.\n" msgstr "ERRO: link simbólico ./bin/sh não existe.\n" -#: ../multistrap:586 +#: ../multistrap:605 msgid "INF: Setting ./bin/sh -> ./bin/dash\n" msgstr "INF: A definir link simbólico ./bin/sh -> ./bin/dash\n" -#: ../multistrap:591 +#: ../multistrap:610 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:606 +#: ../multistrap:625 msgid "I: Tidying up apt cache and list data.\n" msgstr "I: A arrumar dados de lista e de apt cache.\n" -#: ../multistrap:619 +#: ../multistrap:638 msgid "Cannot read apt lists directory.\n" msgstr "Impossível ler directório de listas apt.\n" -#: ../multistrap:627 +#: ../multistrap:646 msgid "Cannot read apt cache directory.\n" msgstr "Impossível ler directório de cache apt.\n" -#: ../multistrap:659 +#: ../multistrap:678 #, perl-format msgid "" "I: dpkg configuration settings:\n" @@ -248,7 +266,7 @@ msgstr "" "I: opções de configuração do dpkg:\n" "\t%s\n" -#: ../multistrap:661 +#: ../multistrap:680 msgid "" "W: Cannot use 'chroot' when fakeroot is in use. Skipping package " "configuration.\n" @@ -258,35 +276,35 @@ msgstr "" # msgid "Cannot read apt archives directory.\n" # msgstr "Impossível ler directório/ de arquivos apt.\n" -#: ../multistrap:664 +#: ../multistrap:683 msgid "I: Native mode - configuring unpacked packages . . .\n" msgstr "I: Modo nativo - a configurar pacotes desempacotados . . .\n" -#: ../multistrap:675 +#: ../multistrap:694 msgid "I: Running preinst scripts with 'upgrade' argument.\n" msgstr "I: A correr scripts 'preinst' com o argumento 'upgrade'.\n" -#: ../multistrap:698 +#: ../multistrap:717 #, perl-format msgid "Cannot open %s directory. %s\n" msgstr "Impossível abrir o directório %s. %s\n" -#: ../multistrap:729 +#: ../multistrap:751 #, perl-format msgid "cannot open apt sources list. %s" msgstr "impossível abrir lista de fontes apt. %s" -#: ../multistrap:735 +#: ../multistrap:757 #, perl-format msgid "cannot open apt sources.list directory %s\n" msgstr "impossível abrir directório de apt sources.list %s\n" -#: ../multistrap:740 +#: ../multistrap:762 #, perl-format msgid "cannot open /etc/apt/sources.list.d/%s %s" msgstr "impossível abrir /etc/apt/sources.list.d/%s %s" -#: ../multistrap:752 +#: ../multistrap:774 #, fuzzy, perl-format msgid "" "\n" @@ -426,21 +444,21 @@ msgstr "" "será criado - não será empacotado num .tgz após ficar completo.\n" "\n" -#: ../multistrap:818 +#: ../multistrap:840 msgid "failed to write usage:" msgstr "falhou a escrita do modo de utilização:" -#: ../multistrap:825 +#: ../multistrap:847 #, perl-format msgid "Failed to parse '%s'!\n" msgstr "" -#: ../multistrap:879 +#: ../multistrap:901 #, perl-format msgid "ERR: Cannot find include file: '%s' for '%s'" msgstr "" -#: ../multistrap:929 +#: ../multistrap:951 #, perl-format msgid "" "ERROR: Your version of apt is too old to support using a codename like '%s'. " @@ -456,132 +474,141 @@ msgstr "" "'experimental'.Em alternativa, actualize o apt para uma versão mais recente " "que 0.7.20.2+lenny1.\n" -#: ../multistrap:949 +#: ../multistrap:971 #, 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:963 +#: ../multistrap:985 #, perl-format msgid "ERR: The '%s' section is not defined.\n" msgstr "ERR: A secção '%s' não está definida.\n" -#: ../multistrap:967 +#: ../multistrap:989 #, fuzzy msgid "Including configuration file from:" 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:971 +#: ../multistrap:993 msgid "No included configuration files.\n" msgstr "Não foram incluídos ficheiros de configuração.\n" -#: ../multistrap:992 +#: ../multistrap:1014 msgid "Not listed as a 'Bootstrap' section." msgstr "" -#: ../multistrap:999 +#: ../multistrap:1021 msgid "Section to install" msgid_plural "Sections to install" msgstr[0] "" msgstr[1] "" -#: ../multistrap:1001 +#: ../multistrap:1023 msgid "Section for updates" msgid_plural "Sections for updates" msgstr[0] "" msgstr[1] "" -#: ../multistrap:1008 +#: ../multistrap:1030 msgid "Omit deb-src from sources.list for sections:" msgstr "Omitir deb-src do sources.list para as secções:" -#: ../multistrap:1010 +#: ../multistrap:1032 msgid "None." msgstr "" -#: ../multistrap:1018 +#: ../multistrap:1040 msgid "Explicit suite selection: Yes\n" msgstr "Selecção explícita de 'suite': Sim\n" -#: ../multistrap:1020 +#: ../multistrap:1042 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:1023 +#: ../multistrap:1045 msgid "Recommended packages are added to the selection.\n" msgstr "Pacotes recomendados são acrescentados à selecção.\n" -#: ../multistrap:1025 +#: ../multistrap:1047 msgid "Recommended packages are ignored.\n" msgstr "Pacotes recomendados são ignorados.\n" -#: ../multistrap:1027 +#: ../multistrap:1049 msgid "Extra Package: " msgid_plural "Extra Packages: " msgstr[0] "" msgstr[1] "" -#: ../multistrap:1033 +#: ../multistrap:1055 #, fuzzy, perl-format msgid "Architecture to download: %s\n" msgstr "Arquitectura: %s\n" -#: ../multistrap:1035 +#: ../multistrap:1057 #, perl-format msgid "Cannot determine architecture from '%s'.\n" msgstr "Impossível determinar a arquitectura a partir de '%s'.\n" -#: ../multistrap:1038 +#: ../multistrap:1060 #, perl-format msgid "Output directory: '%s'\n" msgstr "Directório de saída: '%s'\n" -#: ../multistrap:1040 +#: ../multistrap:1062 #, perl-format msgid "Cannot determine directory from '%s'.\n" msgstr "Impossível determinar o directório a partir de '%s'.\n" -#: ../multistrap:1042 +#: ../multistrap:1064 #, perl-format msgid "extract all downloaded archives: %s\n" msgstr "extrair todos os arquivos descarregados: %s\n" -#: ../multistrap:1044 +#: ../multistrap:1066 msgid "Script to be run after unpacking" msgstr "" -#: ../multistrap:1046 +#: ../multistrap:1068 msgid "'Priority required' packages are not included." msgstr "" -#: ../multistrap:1048 +#: ../multistrap:1070 msgid "'Priority: required' packages are included." msgstr "" -#: ../multistrap:1051 +#: ../multistrap:1073 +msgid "'Priority: important' packages are included.\n" +msgstr "" + +#: ../multistrap:1075 +#, fuzzy +msgid "'Priority: important' packages are ignored.\n" +msgstr "Pacotes recomendados são ignorados.\n" + +#: ../multistrap:1078 msgid "remove apt cache data: true\n" msgstr "remover cache de dados do apt: verdadeiro\n" -#: ../multistrap:1053 +#: ../multistrap:1080 msgid "remove apt cache data: false\n" msgstr "remover cache de dados do apt: falso\n" -#: ../multistrap:1056 +#: ../multistrap:1083 msgid "allow the use of unauthenticated repositories: true\n" msgstr "permitir o uso de repositórios não autenticados: verdadeiro\n" -#: ../multistrap:1058 +#: ../multistrap:1085 msgid "allow the use of unauthenticated repositories: false\n" msgstr "permitir o uso de repositórios não autenticados: falso\n" -#: ../multistrap:1061 +#: ../multistrap:1088 #, perl-format msgid "Sources will be retained in: %s\n" msgstr "Fontes serão guardadas em: %s\n" -#: ../multistrap:1064 +#: ../multistrap:1091 #, perl-format msgid "Tarball name: '%s'\n" msgstr "" diff --git a/po/vi.po b/po/vi.po index 0f8d958..10be01f 100644 --- a/po/vi.po +++ b/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-12-25 12:18+0000\n" +"POT-Creation-Date: 2011-01-23 00:14+0000\n" "PO-Revision-Date: 2010-09-29 19:59+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -28,22 +28,34 @@ 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. #. Translators: fields are: programname, versionstring, configfile. -#: ../multistrap:88 ../multistrap:111 +#: ../multistrap:88 ../multistrap:127 #, perl-format msgid "%s %s using %s\n" msgstr "%s %s dùng %s\n" -#: ../multistrap:116 ../multistrap:118 +#: ../multistrap:94 +msgid "" +"Error: Cannot set 'add Priority: important' when packages of 'Priority: " +"required' are being omitted.\n" +msgstr "" + +#: ../multistrap:97 +#, fuzzy +msgid "Please also check the included configuration file:" +msgid_plural "Please also check the included configuration files:" +msgstr[0] "Không bao gồm tập tin cấu hình nào.\n" + +#: ../multistrap:132 ../multistrap:134 #, 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:120 +#: ../multistrap:136 #, perl-format msgid "Using foreign architecture: %s\n" msgstr "Dùng kiến trúc ngoài: %s\n" -#: ../multistrap:125 +#: ../multistrap:141 #, perl-format msgid "" "No sources defined for a foreign multistrap.\n" @@ -56,83 +68,88 @@ msgstr "" "\tdùng cú pháp « aptsources= »." #. Translators: fields are: programname, architecture, host architecture. -#: ../multistrap:133 +#: ../multistrap:149 #, perl-format msgid "%s building %s multistrap on '%s'\n" msgstr "%s đang xây dựng multistrap %s trên « %s »\n" -#: ../multistrap:135 +#: ../multistrap:151 msgid "No directory specified!" msgstr "" -#: ../multistrap:141 +#: ../multistrap:157 #, perl-format msgid "Unable to create directory '%s'" msgstr "Không thể tạo thư mục « %s »" -#: ../multistrap:192 +#: ../multistrap:207 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:200 +#: ../multistrap:215 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n" msgstr "TIN: Đang đặt liên kết tượng trưng « ./lib64 » -> « ./lib ».\n" -#: ../multistrap:229 ../multistrap:234 ../multistrap:385 ../multistrap:390 +#: ../multistrap:244 ../multistrap:249 ../multistrap:404 ../multistrap:409 msgid "Cannot open sources list" msgstr "Không mở được danh sách nguồn" -#: ../multistrap:253 +#: ../multistrap:268 #, perl-format msgid "I: Installing %s\n" msgstr "TIN: Đang cài đặt %s\n" -#: ../multistrap:268 +#: ../multistrap:283 #, perl-format msgid "Unable to download keyring package: '%s'" msgstr "" -#: ../multistrap:288 +#: ../multistrap:303 msgid "Secure Apt handling failed - try without authentication." msgstr "" # « apt-get » và « update » thuộc về một câu lệnh nghĩa chữ -#: ../multistrap:311 +#: ../multistrap:326 #, 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:313 +#: ../multistrap:328 #, 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:318 +#: ../multistrap:333 msgid "I: Calculating required packages.\n" msgstr "TIN: Đang tính các gói yêu cầu.\n" -#: ../multistrap:354 +#: ../multistrap:338 +#, perl-format +msgid "I: Adding 'Priority: important': %s\n" +msgstr "" + +#: ../multistrap:374 #, 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:367 +#: ../multistrap:386 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:368 +#: ../multistrap:387 #, 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:375 +#: ../multistrap:394 msgid "Cannot read apt sources list directory.\n" msgstr "Không đọc được thư mục danh sách nguồn apt.\n" -#: ../multistrap:404 +#: ../multistrap:423 #, perl-format msgid "" "\n" @@ -142,7 +159,7 @@ msgstr "" "Hệ thống multistrap đã được cài đặt thành công vào %s.\n" "\n" -#: ../multistrap:406 +#: ../multistrap:425 #, perl-format msgid "" "\n" @@ -151,7 +168,7 @@ msgstr "" "\n" "Đang nén hệ thống multistrap trong « %s » thành một kho lưu tên: « %s ».\n" -#: ../multistrap:412 +#: ../multistrap:431 #, perl-format msgid "" "\n" @@ -160,7 +177,7 @@ msgstr "" "\n" "Đang gỡ bỏ thư mục xây dựng: « %s »\n" -#: ../multistrap:417 +#: ../multistrap:436 #, perl-format msgid "" "\n" @@ -170,30 +187,30 @@ msgstr "" "Hệ thống multistrap đã được đóng gói thành công thành « %s ».\n" "\n" -#: ../multistrap:443 ../multistrap:484 ../multistrap:637 +#: ../multistrap:462 ../multistrap:503 ../multistrap:656 msgid "Cannot read apt archives directory.\n" msgstr "Không đọc được thư mục kho lưu apt.\n" -#: ../multistrap:456 +#: ../multistrap:475 msgid "I: Calculating obsolete packages\n" msgstr "TIN: Đang tính các gói cũ\n" -#: ../multistrap:470 ../multistrap:474 +#: ../multistrap:489 ../multistrap:493 #, perl-format msgid "I: Removing %s\n" msgstr "TIN: Đang gỡ bỏ %s\n" -#: ../multistrap:491 +#: ../multistrap:510 #, 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:493 +#: ../multistrap:512 #, perl-format msgid "I: Extracting %s...\n" msgstr "TIN: Đang giải nén %s...\n" -#: ../multistrap:506 +#: ../multistrap:525 #, perl-format msgid "" "dpkg -X failed with error code %s\n" @@ -202,52 +219,52 @@ msgstr "" "« dpkg -X » bị lỗi với mã lỗi %s\n" "Đang bỏ qua...\n" -#: ../multistrap:542 +#: ../multistrap:561 #, 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:561 +#: ../multistrap:580 #, 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:564 +#: ../multistrap:583 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:571 +#: ../multistrap:590 msgid "I: Unpacking complete.\n" msgstr "TIN: Hoàn tất mở gói.\n" -#: ../multistrap:584 +#: ../multistrap:603 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:586 +#: ../multistrap:605 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:591 +#: ../multistrap:610 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:606 +#: ../multistrap:625 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:619 +#: ../multistrap:638 msgid "Cannot read apt lists directory.\n" msgstr "Không đọc được thư mục danh sách apt.\n" -#: ../multistrap:627 +#: ../multistrap:646 msgid "Cannot read apt cache directory.\n" msgstr "Không đọc được thư mục nhớ tạm apt.\n" -#: ../multistrap:659 +#: ../multistrap:678 #, perl-format msgid "" "I: dpkg configuration settings:\n" @@ -256,7 +273,7 @@ msgstr "" "TIN: Thiết lập cấu hình dpkg:\n" "\t%s\n" -#: ../multistrap:661 +#: ../multistrap:680 msgid "" "W: Cannot use 'chroot' when fakeroot is in use. Skipping package " "configuration.\n" @@ -264,36 +281,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:664 +#: ../multistrap:683 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:675 +#: ../multistrap:694 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:698 +#: ../multistrap:717 #, perl-format msgid "Cannot open %s directory. %s\n" msgstr "Không mở được thư mục %s. %s\n" -#: ../multistrap:729 +#: ../multistrap:751 #, perl-format msgid "cannot open apt sources list. %s" msgstr "không mở được danh sách nguồn apt. %s" -#: ../multistrap:735 +#: ../multistrap:757 #, 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:740 +#: ../multistrap:762 #, 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:752 +#: ../multistrap:774 #, fuzzy, perl-format msgid "" "\n" @@ -434,21 +451,21 @@ 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:818 +#: ../multistrap:840 msgid "failed to write usage:" msgstr "lỗi ghi cách sử dụng:" -#: ../multistrap:825 +#: ../multistrap:847 #, perl-format msgid "Failed to parse '%s'!\n" msgstr "" -#: ../multistrap:879 +#: ../multistrap:901 #, perl-format msgid "ERR: Cannot find include file: '%s' for '%s'" msgstr "" -#: ../multistrap:929 +#: ../multistrap:951 #, perl-format msgid "" "ERROR: Your version of apt is too old to support using a codename like '%s'. " @@ -468,128 +485,137 @@ 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:949 +#: ../multistrap:971 #, 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:963 +#: ../multistrap:985 #, perl-format msgid "ERR: The '%s' section is not defined.\n" msgstr "LỖI: chưa xác định phần « %s ».\n" -#: ../multistrap:967 +#: ../multistrap:989 #, fuzzy msgid "Including configuration file from:" msgid_plural "Including configuration files from:" msgstr[0] "Gồm có tập tin cấu hình từ : " -#: ../multistrap:971 +#: ../multistrap:993 msgid "No included configuration files.\n" msgstr "Không bao gồm tập tin cấu hình nào.\n" -#: ../multistrap:992 +#: ../multistrap:1014 msgid "Not listed as a 'Bootstrap' section." msgstr "" -#: ../multistrap:999 +#: ../multistrap:1021 msgid "Section to install" msgid_plural "Sections to install" msgstr[0] "" -#: ../multistrap:1001 +#: ../multistrap:1023 msgid "Section for updates" msgid_plural "Sections for updates" msgstr[0] "" -#: ../multistrap:1008 +#: ../multistrap:1030 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:1010 +#: ../multistrap:1032 msgid "None." msgstr "" -#: ../multistrap:1018 +#: ../multistrap:1040 msgid "Explicit suite selection: Yes\n" msgstr "Chọn dứt khoát bộ ứng dụng: Có\n" -#: ../multistrap:1020 +#: ../multistrap:1042 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:1023 +#: ../multistrap:1045 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:1025 +#: ../multistrap:1047 msgid "Recommended packages are ignored.\n" msgstr "Các gói khuyến khích bị bỏ qua.\n" -#: ../multistrap:1027 +#: ../multistrap:1049 msgid "Extra Package: " msgid_plural "Extra Packages: " msgstr[0] "" -#: ../multistrap:1033 +#: ../multistrap:1055 #, fuzzy, perl-format msgid "Architecture to download: %s\n" msgstr "Kiến trúc: %s\n" -#: ../multistrap:1035 +#: ../multistrap:1057 #, perl-format msgid "Cannot determine architecture from '%s'.\n" msgstr "Không thể quyết định kiến trúc từ « %s ».\n" -#: ../multistrap:1038 +#: ../multistrap:1060 #, perl-format msgid "Output directory: '%s'\n" msgstr "Thư mục kết xuất: « %s »\n" -#: ../multistrap:1040 +#: ../multistrap:1062 #, perl-format msgid "Cannot determine directory from '%s'.\n" msgstr "Không thể quyết định thư mục từ « %s ».\n" -#: ../multistrap:1042 +#: ../multistrap:1064 #, 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:1044 +#: ../multistrap:1066 msgid "Script to be run after unpacking" msgstr "" -#: ../multistrap:1046 +#: ../multistrap:1068 msgid "'Priority required' packages are not included." msgstr "" -#: ../multistrap:1048 +#: ../multistrap:1070 msgid "'Priority: required' packages are included." msgstr "" -#: ../multistrap:1051 +#: ../multistrap:1073 +msgid "'Priority: important' packages are included.\n" +msgstr "" + +#: ../multistrap:1075 +#, fuzzy +msgid "'Priority: important' packages are ignored.\n" +msgstr "Các gói khuyến khích bị bỏ qua.\n" + +#: ../multistrap:1078 msgid "remove apt cache data: true\n" msgstr "gỡ bỏ dữ liệu nhớ tạm apt: đúng\n" -#: ../multistrap:1053 +#: ../multistrap:1080 msgid "remove apt cache data: false\n" msgstr "gỡ bỏ dữ liệu nhớ tạm apt: sai\n" -#: ../multistrap:1056 +#: ../multistrap:1083 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:1058 +#: ../multistrap:1085 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:1061 +#: ../multistrap:1088 #, perl-format msgid "Sources will be retained in: %s\n" msgstr "Các nguồn sẽ được giữ lại trong: %s\n" -#: ../multistrap:1064 +#: ../multistrap:1091 #, perl-format msgid "Tarball name: '%s'\n" msgstr "" diff --git a/pod/multistrap b/pod/multistrap index 4b28b32..27360b4 100644 --- a/pod/multistrap +++ b/pod/multistrap @@ -408,19 +408,39 @@ be called in the variant configuration file (General section): =head1 Restricting package selection C includes Required packages by default, the current list -of packages can be seen using: +of packages on your own machine can be seen using: grep-available -FPriority 'required' -sPackage +(The actual list is calculated from the downloaded Packages files +and may differ from the output of C.) + 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 packages specified manually in the configuration files will be used in the calculations - dependencies of those packages will be added but no others. -Packages with Priority: important or standard are never included by -C unless specifically included in a C option in -a section specified in the C general option. +=head1 Adding Priority: important packages + +C can imitate C by automatically adding all +packages from all sections where the downloaded Packages file lists +the package as Priority: important. The default is not to add such +packages unless individually included in a C option in +a section specified in the C general option. To add +all such packages, set the addimportant option to true in the general +section. + + addimportant=true + +Priority: important can only operate for all sections listed in the +C option. This may cause some confusion when mixing suites. + +It is not possible to enable addimportant and omitrequired in the +same configuration. C will exit with error code 7 if +any configuration results in addimportant and omitrequired both being +set to true. (This includes the effects of including other configuration +files.) =head1 Recommends behaviour