diff --git a/debian/changelog b/debian/changelog index 4766bd9..b9e5507 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,12 @@ multistrap (2.1.9) experimental; urgency=low * Allow missing packages lines and add note about using omitdebsrc with debian-ports. + * Allow multiple packages lines per section to support very long + lists. + * Update the trustdb.gpg with keyrings, to fix gpgv errors on + missing file. - -- Neil Williams Fri, 29 Oct 2010 15:27:21 +0100 + -- Neil Williams Sat, 25 Dec 2010 12:26:24 +0000 multistrap (2.1.8) experimental; urgency=low diff --git a/multistrap b/multistrap index de3b045..e025171 100755 --- a/multistrap +++ b/multistrap @@ -48,36 +48,27 @@ while( @ARGV ) { if (!/^-/) { unshift(@ARGV,$_); last; - } - elsif (/^(-\?|-h|--help|--version)$/) { + } elsif (/^(-\?|-h|--help|--version)$/) { &usageversion(); exit( 0 ); - } - elsif (/^(-f|--file)$/) { + } elsif (/^(-f|--file)$/) { $file = shift(@ARGV); - } - elsif (/^(-a|--arch)$/) { + } elsif (/^(-a|--arch)$/) { $arch = shift(@ARGV); - } - elsif (/^(-d|--dir)$/) { + } elsif (/^(-d|--dir)$/) { $dir = shift(@ARGV); $dir .= ($dir =~ m:/$:) ? '' : "/"; - } - elsif (/^(--tidy-up)$/) { + } elsif (/^(--tidy-up)$/) { $tidy++; - } - elsif (/^(--source-dir)$/) { + } elsif (/^(--source-dir)$/) { $sourcedir = shift (@ARGV); $sourcedir .= ($sourcedir =~ m:/$:) ? '' : "/"; $sourcedir = (-d $sourcedir) ? $sourcedir : undef; - } - elsif (/^(--no-auth)$/) { + } elsif (/^(--no-auth)$/) { $noauth++; - } - elsif (/^(--dry-run|--simulate)$/) { + } elsif (/^(--dry-run|--simulate)$/) { $dryrun++; - } - else { + } else { die "$progname: "._g("Unknown option")." $_.\n"; } } @@ -893,9 +884,13 @@ sub cascade { } else { $sources{$section}=$keys{$section}{'source'} if (not exists $source{$section}); # don't set suite or component if URL is of apt-ftparchive trailing-slash form - # regexp is: optional string in '[]', string without '[' or ']', string ending in '/' + # regexp is: optional string in '[]', string without '[' or ']', string ending in '/' $flatfile{$section}++ if (($sources{$section} =~ /^(\[.*\] )*[^\[\]]+ .+\/$/)); - $packages{$section}=$keys{$section}{'packages'} if (not exists $packages{$section}); + if (ref ($keys{$section}{'packages'}) eq 'ARRAY') { + $packages{$section}=join(' ', @{$keys{$section}{'packages'}}) if (not exists $packages{$section}); + } else { + $packages{$section}=join(' ', $keys{$section}{'packages'}) if (not exists $packages{$section}); + } $suites{$section}=$keys{$section}{'suite'} if (not exists $suites{$section} and not exists $flatfile{$section}); $components{$section}=$keys{$section}{'components'} diff --git a/po/da.po b/po/da.po index 00fd7d6..b9eba40 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-10-16 12:35+0100\n" +"POT-Creation-Date: 2010-12-25 12:18+0000\n" "PO-Revision-Date: 2010-09-03 17:30+01:00\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -18,33 +18,33 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../multistrap:81 +#: ../multistrap:72 msgid "Unknown option" msgstr "Ukendt tilvalg" -#: ../multistrap:84 +#: ../multistrap:75 #, perl-format msgid "Need a configuration file - use %s -f\n" msgstr "Kræver en konfigurationsfil - brug %s -f\n" #. Translators: fields are programname, version string, include file. #. Translators: fields are: programname, versionstring, configfile. -#: ../multistrap:97 ../multistrap:120 +#: ../multistrap:88 ../multistrap:111 #, perl-format msgid "%s %s using %s\n" msgstr "%s %s ved brug af %s\n" -#: ../multistrap:125 ../multistrap:127 +#: ../multistrap:116 ../multistrap:118 #, perl-format msgid "Defaulting architecture to native: %s\n" msgstr "Falder tilbage på oprindelig arkitektur: %s\n" -#: ../multistrap:129 +#: ../multistrap:120 #, perl-format msgid "Using foreign architecture: %s\n" msgstr "Bruger fremmed arkitektur: %s\n" -#: ../multistrap:134 +#: ../multistrap:125 #, perl-format msgid "" "No sources defined for a foreign multistrap.\n" @@ -56,76 +56,80 @@ msgstr "" "\tvis dem med aptsources= i '%s'." #. Translators: fields are: programname, architecture, host architecture. -#: ../multistrap:142 +#: ../multistrap:133 #, perl-format msgid "%s building %s multistrap on '%s'\n" msgstr "%s bygger %s multistrap på '%s'\n" -#: ../multistrap:144 +#: ../multistrap:135 msgid "No directory specified!" msgstr "" -#: ../multistrap:150 +#: ../multistrap:141 #, perl-format msgid "Unable to create directory '%s'" msgstr "Kunne ikke oprette mappe '%s'" -#: ../multistrap:201 +#: ../multistrap:192 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "INF: ./lib64 -> /lib symbolsk henvisning nulstil til ./lib.\n" -#: ../multistrap:209 +#: ../multistrap:200 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n" msgstr "INF: Setting ./lib64 -> ./lib symbolic link.\n" -#: ../multistrap:238 ../multistrap:243 ../multistrap:389 ../multistrap:394 +#: ../multistrap:229 ../multistrap:234 ../multistrap:385 ../multistrap:390 msgid "Cannot open sources list" msgstr "Kan ikke åbne kildeliste" -#: ../multistrap:262 +#: ../multistrap:253 #, perl-format msgid "I: Installing %s\n" msgstr "I: Installerer %s\n" -#: ../multistrap:277 +#: ../multistrap:268 #, perl-format msgid "Unable to download keyring package: '%s'" msgstr "" -#: ../multistrap:315 +#: ../multistrap:288 +msgid "Secure Apt handling failed - try without authentication." +msgstr "" + +#: ../multistrap:311 #, perl-format msgid "Getting package lists: apt-get %s update\n" msgstr "Henter pakkelister: apt-get %s opdater\n" -#: ../multistrap:317 +#: ../multistrap:313 #, perl-format msgid "apt update failed. Exit value: %d\n" msgstr "apt update mislykkedes. Afslutningsværdi: %d\n" -#: ../multistrap:322 +#: ../multistrap:318 msgid "I: Calculating required packages.\n" msgstr "I: Kalkulerer krævede pakker.\n" -#: ../multistrap:358 +#: ../multistrap:354 #, perl-format msgid "apt download failed. Exit value: %d\n" msgstr "apt-hentning mislykkedes. Afslutningsværdi: %d\n" -#: ../multistrap:371 +#: ../multistrap:367 msgid "ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n" msgstr "" "ERR: ./lib64 -> /lib symbolsk henvisning nulstil til ./lib efter udpakning.\n" -#: ../multistrap:372 +#: ../multistrap:368 #, perl-format msgid "ERR: Some files may have been unpacked outside %s!\n" msgstr "ERR: Nogle filer er måske blevet udpakket udenfor %s!\n" -#: ../multistrap:379 +#: ../multistrap:375 msgid "Cannot read apt sources list directory.\n" msgstr "Kan ikke læse apt-kildernes listemappe.\n" -#: ../multistrap:408 +#: ../multistrap:404 #, perl-format msgid "" "\n" @@ -134,7 +138,7 @@ msgstr "" "\n" "Multistrap system installeret i %s.\n" -#: ../multistrap:410 +#: ../multistrap:406 #, perl-format msgid "" "\n" @@ -143,7 +147,7 @@ msgstr "" "\n" "Pakker multistrap system i '%s' til en tarball kaldt: '%s'.\n" -#: ../multistrap:416 +#: ../multistrap:412 #, perl-format msgid "" "\n" @@ -152,7 +156,7 @@ msgstr "" "\n" "Fjerner kompileringsmappe: '%s'\n" -#: ../multistrap:421 +#: ../multistrap:417 #, perl-format msgid "" "\n" @@ -161,30 +165,30 @@ msgstr "" "\n" "Multistrap system pakket som '%s'.\n" -#: ../multistrap:447 ../multistrap:488 ../multistrap:641 +#: ../multistrap:443 ../multistrap:484 ../multistrap:637 msgid "Cannot read apt archives directory.\n" msgstr "Kan ikke læse apt-arkivets mappe.\n" -#: ../multistrap:460 +#: ../multistrap:456 msgid "I: Calculating obsolete packages\n" msgstr "I: Kalkulerer forældede pakker\n" -#: ../multistrap:474 ../multistrap:478 +#: ../multistrap:470 ../multistrap:474 #, perl-format msgid "I: Removing %s\n" msgstr "I: Fjerner %s\n" -#: ../multistrap:495 +#: ../multistrap:491 #, perl-format msgid "Using directory %s for unpacking operations\n" msgstr "Bruger mappe %s til udpakningshandlinger\n" -#: ../multistrap:497 +#: ../multistrap:493 #, perl-format msgid "I: Extracting %s...\n" msgstr "I: Udpakker %s...\n" -#: ../multistrap:510 +#: ../multistrap:506 #, perl-format msgid "" "dpkg -X failed with error code %s\n" @@ -193,49 +197,49 @@ msgstr "" "dpkg -X mislykkedes med fejlkode %s\n" "Springer over...\n" -#: ../multistrap:546 +#: ../multistrap:542 #, perl-format msgid " -> Processing conffiles for %s\n" msgstr " -> Behandler conffiler for %s\n" -#: ../multistrap:565 +#: ../multistrap:561 #, perl-format msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n" msgstr "ERR: lib64 -> ./lib symbolsk henvisning knust af %s\n" -#: ../multistrap:568 +#: ../multistrap:564 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "INF: lib64 -> /lib symbolsk henvisning nulstil til ./lib.\n" -#: ../multistrap:575 +#: ../multistrap:571 msgid "I: Unpacking complete.\n" msgstr "I: Udpakning færdig.\n" -#: ../multistrap:588 +#: ../multistrap:584 msgid "ERR: ./bin/sh symbolic link does not exist.\n" msgstr "ERR: ./bin/sh symbolsk henvisning eksisterer ikke.\n" -#: ../multistrap:590 +#: ../multistrap:586 msgid "INF: Setting ./bin/sh -> ./bin/dash\n" msgstr "INF: Indstiller ./bin/sh -> ./bin/dash\n" -#: ../multistrap:595 +#: ../multistrap:591 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:610 +#: ../multistrap:606 msgid "I: Tidying up apt cache and list data.\n" msgstr "I: Rydder op i apt-mellemlager og listedata.\n" -#: ../multistrap:623 +#: ../multistrap:619 msgid "Cannot read apt lists directory.\n" msgstr "Kan ikke læse apt-listemapper.\n" -#: ../multistrap:631 +#: ../multistrap:627 msgid "Cannot read apt cache directory.\n" msgstr "Kan ikke læse apt-mellemlagermappe.\n" -#: ../multistrap:663 +#: ../multistrap:659 #, perl-format msgid "" "I: dpkg configuration settings:\n" @@ -244,7 +248,7 @@ msgstr "" "I: Opsætning af dpkg-konfiguration:\n" "\t%s\n" -#: ../multistrap:665 +#: ../multistrap:661 msgid "" "W: Cannot use 'chroot' when fakeroot is in use. Skipping package " "configuration.\n" @@ -252,35 +256,35 @@ msgstr "" "W: Kan ikke bruge 'chroot' når fakeroot er i brug. Springer " "pakkekonfiguration over.\n" -#: ../multistrap:668 +#: ../multistrap:664 msgid "I: Native mode - configuring unpacked packages . . .\n" msgstr "I: Standardtilstand - konfigurerer upakkede pakker...\n" -#: ../multistrap:679 +#: ../multistrap:675 msgid "I: Running preinst scripts with 'upgrade' argument.\n" msgstr "I: Kører preinst-skripter med argumentet 'upgrade'.\n" -#: ../multistrap:702 +#: ../multistrap:698 #, perl-format msgid "Cannot open %s directory. %s\n" msgstr "Kan ikke åben mappen %s. %s\n" -#: ../multistrap:733 +#: ../multistrap:729 #, perl-format msgid "cannot open apt sources list. %s" msgstr "kan ikke åbne apt-kildeliste. %s" -#: ../multistrap:739 +#: ../multistrap:735 #, perl-format msgid "cannot open apt sources.list directory %s\n" msgstr "kan ikke åbne apt-sources-list-mappe %s\n" -#: ../multistrap:744 +#: ../multistrap:740 #, perl-format msgid "cannot open /etc/apt/sources.list.d/%s %s" msgstr "kan ikke åbne /etc/apt/sources.list.d/%s %s" -#: ../multistrap:756 +#: ../multistrap:752 #, fuzzy, perl-format msgid "" "\n" @@ -416,16 +420,21 @@ msgstr "" "hvis den ikke pakkes ind i en .tgz når den først er færdig.\n" "\n" -#: ../multistrap:822 +#: ../multistrap:818 msgid "failed to write usage:" msgstr "kunne ikke skrive brug:" -#: ../multistrap:880 +#: ../multistrap:825 +#, perl-format +msgid "Failed to parse '%s'!\n" +msgstr "" + +#: ../multistrap:879 #, perl-format msgid "ERR: Cannot find include file: '%s' for '%s'" msgstr "" -#: ../multistrap:926 +#: ../multistrap:929 #, perl-format msgid "" "ERROR: Your version of apt is too old to support using a codename like '%s'. " @@ -441,132 +450,132 @@ msgstr "" "'unstable' eller 'experimental'. Alternativt kan du opgradere til en version " "af apt, der er nyere end 0.7.20.2+lenny1.\n" -#: ../multistrap:946 +#: ../multistrap:949 #, perl-format msgid "The supplied configuration file '%s' cannot be parsed correctly." msgstr "Den angivne konfigurationsfil '%s' kan ikke fortolkes korrekt." -#: ../multistrap:960 +#: ../multistrap:963 #, perl-format msgid "ERR: The '%s' section is not defined.\n" msgstr "FEJL: Afsnittet '%s' er ikke defineret.\n" -#: ../multistrap:964 +#: ../multistrap:967 #, fuzzy msgid "Including configuration file from:" msgid_plural "Including configuration files from:" msgstr[0] "Inklusiv konfigurationsfil fra: " msgstr[1] "Inklusiv konfigurationsfil fra: " -#: ../multistrap:968 +#: ../multistrap:971 msgid "No included configuration files.\n" msgstr "Ingen inkluderede konfigurationsfiler\n" -#: ../multistrap:988 +#: ../multistrap:992 msgid "Not listed as a 'Bootstrap' section." msgstr "" -#: ../multistrap:995 +#: ../multistrap:999 msgid "Section to install" msgid_plural "Sections to install" msgstr[0] "" msgstr[1] "" -#: ../multistrap:997 +#: ../multistrap:1001 msgid "Section for updates" msgid_plural "Sections for updates" msgstr[0] "" msgstr[1] "" -#: ../multistrap:1004 +#: ../multistrap:1008 msgid "Omit deb-src from sources.list for sections:" msgstr "Udelad deb-src fra sources.list for afsnit:" -#: ../multistrap:1006 +#: ../multistrap:1010 msgid "None." msgstr "" -#: ../multistrap:1014 +#: ../multistrap:1018 msgid "Explicit suite selection: Yes\n" msgstr "Eksplicit programpakkevalg: Ja\n" -#: ../multistrap:1016 +#: ../multistrap:1020 msgid "Explicit suite selection: No - let apt use latest.\n" msgstr "Eksplicit programvalg: Nej - lad apt bruge seneste.\n" -#: ../multistrap:1019 +#: ../multistrap:1023 msgid "Recommended packages are added to the selection.\n" msgstr "Anbefalede pakker tilføjes til valget.\n" -#: ../multistrap:1021 +#: ../multistrap:1025 msgid "Recommended packages are ignored.\n" msgstr "Anbefalede pakker ignoreres.\n" -#: ../multistrap:1023 +#: ../multistrap:1027 msgid "Extra Package: " msgid_plural "Extra Packages: " msgstr[0] "" msgstr[1] "" -#: ../multistrap:1029 +#: ../multistrap:1033 #, fuzzy, perl-format msgid "Architecture to download: %s\n" msgstr "Arkitektur: %s\n" -#: ../multistrap:1031 +#: ../multistrap:1035 #, perl-format msgid "Cannot determine architecture from '%s'.\n" msgstr "Kan ikke bestemme arkitektur fra '%s'.\n" -#: ../multistrap:1034 +#: ../multistrap:1038 #, perl-format msgid "Output directory: '%s'\n" msgstr "Uddatamappe: '%s'\n" -#: ../multistrap:1036 +#: ../multistrap:1040 #, perl-format msgid "Cannot determine directory from '%s'.\n" msgstr "Kan ikke bestemme mappe fra '%s'.\n" -#: ../multistrap:1038 +#: ../multistrap:1042 #, perl-format msgid "extract all downloaded archives: %s\n" msgstr "udtræk alle hentede arkiver: %s\n" -#: ../multistrap:1040 +#: ../multistrap:1044 msgid "Script to be run after unpacking" msgstr "" -#: ../multistrap:1042 +#: ../multistrap:1046 msgid "'Priority required' packages are not included." msgstr "" -#: ../multistrap:1044 +#: ../multistrap:1048 msgid "'Priority: required' packages are included." msgstr "" -#: ../multistrap:1047 +#: ../multistrap:1051 msgid "remove apt cache data: true\n" msgstr "fjern apt-mellemlagerdata: true\n" -#: ../multistrap:1049 +#: ../multistrap:1053 msgid "remove apt cache data: false\n" msgstr "fjern apt-mellemlagerdata: false\n" -#: ../multistrap:1052 +#: ../multistrap:1056 msgid "allow the use of unauthenticated repositories: true\n" msgstr "tillad brugen af arkiver der ikke er godkendte: true\n" -#: ../multistrap:1054 +#: ../multistrap:1058 msgid "allow the use of unauthenticated repositories: false\n" msgstr "tillad brugen af arkiver der ikke ikke er godkendte: false\n" -#: ../multistrap:1057 +#: ../multistrap:1061 #, perl-format msgid "Sources will be retained in: %s\n" msgstr "Kilder vil blive bevaret i: %s\n" -#: ../multistrap:1060 +#: ../multistrap:1064 #, perl-format msgid "Tarball name: '%s'\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 6d535ab..8ad990d 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-10-16 12:35+0100\n" +"POT-Creation-Date: 2010-12-25 12:18+0000\n" "PO-Revision-Date: 2010-09-26 21:07+0200\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -17,11 +17,11 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../multistrap:81 +#: ../multistrap:72 msgid "Unknown option" msgstr "Option inconnue" -#: ../multistrap:84 +#: ../multistrap:75 #, perl-format msgid "Need a configuration file - use %s -f\n" msgstr "" @@ -30,22 +30,22 @@ msgstr "" #. Translators: fields are programname, version string, include file. #. Translators: fields are: programname, versionstring, configfile. -#: ../multistrap:97 ../multistrap:120 +#: ../multistrap:88 ../multistrap:111 #, perl-format msgid "%s %s using %s\n" msgstr "%s %s utilise %s\n" -#: ../multistrap:125 ../multistrap:127 +#: ../multistrap:116 ../multistrap:118 #, perl-format msgid "Defaulting architecture to native: %s\n" msgstr "Utilisation de l'architecture native %s\n" -#: ../multistrap:129 +#: ../multistrap:120 #, perl-format msgid "Using foreign architecture: %s\n" msgstr "Utilisation de l'architecture %s\n" -#: ../multistrap:134 +#: ../multistrap:125 #, perl-format msgid "" "No sources defined for a foreign multistrap.\n" @@ -57,78 +57,82 @@ msgstr "" "\tsources différentes, listez les avec aptsources= dans « %s »." #. Translators: fields are: programname, architecture, host architecture. -#: ../multistrap:142 +#: ../multistrap:133 #, perl-format msgid "%s building %s multistrap on '%s'\n" msgstr "%s construit un multistrap pour l'architecture « %s » sur « %s »\n" -#: ../multistrap:144 +#: ../multistrap:135 msgid "No directory specified!" msgstr "" -#: ../multistrap:150 +#: ../multistrap:141 #, perl-format msgid "Unable to create directory '%s'" msgstr "Impossible de créer le répertoire « %s »" -#: ../multistrap:201 +#: ../multistrap:192 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "" "INF : le lien symbolique ./lib64 -> /lib pointe maintenant vers ./lib.\n" -#: ../multistrap:209 +#: ../multistrap:200 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n" msgstr "INF : définition du lien symbolique ./lib64 -> ./lib.\n" -#: ../multistrap:238 ../multistrap:243 ../multistrap:389 ../multistrap:394 +#: ../multistrap:229 ../multistrap:234 ../multistrap:385 ../multistrap:390 msgid "Cannot open sources list" msgstr "Impossible d'ouvrir la liste des sources" -#: ../multistrap:262 +#: ../multistrap:253 #, perl-format msgid "I: Installing %s\n" msgstr "I : installation de %s\n" -#: ../multistrap:277 +#: ../multistrap:268 #, perl-format msgid "Unable to download keyring package: '%s'" msgstr "" -#: ../multistrap:315 +#: ../multistrap:288 +msgid "Secure Apt handling failed - try without authentication." +msgstr "" + +#: ../multistrap:311 #, 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:317 +#: ../multistrap:313 #, perl-format msgid "apt update failed. Exit value: %d\n" msgstr "Échec de la mise à jour apt. Code de sortie : %d\n" -#: ../multistrap:322 +#: ../multistrap:318 msgid "I: Calculating required packages.\n" msgstr "I : prise en compte des paquets requis.\n" -#: ../multistrap:358 +#: ../multistrap:354 #, perl-format msgid "apt download failed. Exit value: %d\n" msgstr "Échec du téléchargement apt. Code de sortie : %d\n" -#: ../multistrap:371 +#: ../multistrap:367 msgid "ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n" msgstr "" "ERR : le lien symbolique ./lib64 -> /lib pointera vers ./lib après le " "dépaquetage.\n" -#: ../multistrap:372 +#: ../multistrap:368 #, perl-format msgid "ERR: Some files may have been unpacked outside %s!\n" msgstr "ERR : certains fichiers ont été dépaquetés hors de %s !\n" -#: ../multistrap:379 +#: ../multistrap:375 msgid "Cannot read apt sources list directory.\n" msgstr "Impossible de lire le répertoire des sources d'apt.\n" -#: ../multistrap:408 +#: ../multistrap:404 #, perl-format msgid "" "\n" @@ -137,7 +141,7 @@ msgstr "" "\n" "Système multistrap installé avec succès dans %s.\n" -#: ../multistrap:410 +#: ../multistrap:406 #, perl-format msgid "" "\n" @@ -147,7 +151,7 @@ msgstr "" "Compression du système multistrap se trouvant dans « %s » dans une archive " "tar nommée : « %s ».\n" -#: ../multistrap:416 +#: ../multistrap:412 #, perl-format msgid "" "\n" @@ -156,7 +160,7 @@ msgstr "" "\n" "Suppression du répertoire de compilation : « %s »\n" -#: ../multistrap:421 +#: ../multistrap:417 #, perl-format msgid "" "\n" @@ -165,30 +169,30 @@ msgstr "" "\n" "Système multistrap empaqueté avec succès dans « %s ».\n" -#: ../multistrap:447 ../multistrap:488 ../multistrap:641 +#: ../multistrap:443 ../multistrap:484 ../multistrap:637 msgid "Cannot read apt archives directory.\n" msgstr "Impossible d'accéder au répertoire des archives apt.\n" -#: ../multistrap:460 +#: ../multistrap:456 msgid "I: Calculating obsolete packages\n" msgstr "I : identification des paquets obsolètes\n" -#: ../multistrap:474 ../multistrap:478 +#: ../multistrap:470 ../multistrap:474 #, perl-format msgid "I: Removing %s\n" msgstr "I : suppression de %s\n" -#: ../multistrap:495 +#: ../multistrap:491 #, 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:497 +#: ../multistrap:493 #, perl-format msgid "I: Extracting %s...\n" msgstr "I : extraction de %s...\n" -#: ../multistrap:510 +#: ../multistrap:506 #, perl-format msgid "" "dpkg -X failed with error code %s\n" @@ -197,51 +201,51 @@ msgstr "" "dpkg -X a échoué avec le code d'erreur %s\n" "Annulation...\n" -#: ../multistrap:546 +#: ../multistrap:542 #, perl-format msgid " -> Processing conffiles for %s\n" msgstr " -> Traitement des fichiers de configuration pour %s\n" -#: ../multistrap:565 +#: ../multistrap:561 #, 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:568 +#: ../multistrap:564 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "INF : le lien symbolique lib64 -> /lib pointe maintenant vers ./lib.\n" -#: ../multistrap:575 +#: ../multistrap:571 msgid "I: Unpacking complete.\n" msgstr "I : dépaquetage terminé.\n" -#: ../multistrap:588 +#: ../multistrap:584 msgid "ERR: ./bin/sh symbolic link does not exist.\n" msgstr "ERR : le lien symbolique ./bin/sh n'existe pas.\n" -#: ../multistrap:590 +#: ../multistrap:586 msgid "INF: Setting ./bin/sh -> ./bin/dash\n" msgstr "INF : définition du lien symbolique ./bin/sh -> ./bin/dash\n" -#: ../multistrap:595 +#: ../multistrap:591 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:610 +#: ../multistrap:606 msgid "I: Tidying up apt cache and list data.\n" msgstr "I : nettoyage du cache apt et des listes de données.\n" -#: ../multistrap:623 +#: ../multistrap:619 msgid "Cannot read apt lists directory.\n" msgstr "Impossible d'accéder au répertoire des listes apt.\n" -#: ../multistrap:631 +#: ../multistrap:627 msgid "Cannot read apt cache directory.\n" msgstr "Impossible d'accéder au répertoire du cache apt.\n" -#: ../multistrap:663 +#: ../multistrap:659 #, perl-format msgid "" "I: dpkg configuration settings:\n" @@ -250,7 +254,7 @@ msgstr "" "I : paramètres de configuration de dpkg :\n" "\t%s\n" -#: ../multistrap:665 +#: ../multistrap:661 msgid "" "W: Cannot use 'chroot' when fakeroot is in use. Skipping package " "configuration.\n" @@ -260,37 +264,37 @@ msgstr "" # msgid "Cannot read apt archives directory.\n # msgstr "Impossible d'accéder au répertoire des archives apt.\n -#: ../multistrap:668 +#: ../multistrap:664 msgid "I: Native mode - configuring unpacked packages . . .\n" msgstr "I : mode natif, configure les paquets décompressés...\n" -#: ../multistrap:679 +#: ../multistrap:675 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:702 +#: ../multistrap:698 #, perl-format msgid "Cannot open %s directory. %s\n" msgstr "Impossible d'accéder au répertoire %s. %s\n" -#: ../multistrap:733 +#: ../multistrap:729 #, perl-format msgid "cannot open apt sources list. %s" msgstr "Impossible d'accéder à la liste des sources apt. %s" -#: ../multistrap:739 +#: ../multistrap:735 #, 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:744 +#: ../multistrap:740 #, 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:756 +#: ../multistrap:752 #, fuzzy, perl-format msgid "" "\n" @@ -434,16 +438,21 @@ msgstr "" "sera créé. Il n'est pas empaqueté dans un .tgz une fois fini.\n" "\n" -#: ../multistrap:822 +#: ../multistrap:818 msgid "failed to write usage:" msgstr "Impossible d'afficher l'aide :" -#: ../multistrap:880 +#: ../multistrap:825 +#, perl-format +msgid "Failed to parse '%s'!\n" +msgstr "" + +#: ../multistrap:879 #, perl-format msgid "ERR: Cannot find include file: '%s' for '%s'" msgstr "" -#: ../multistrap:926 +#: ../multistrap:929 #, perl-format msgid "" "ERROR: Your version of apt is too old to support using a codename like '%s'. " @@ -460,135 +469,135 @@ msgstr "" "experimental ». Vous pouvez également mettre à jour apt vers une version " "plus récente que 0.7.20.2+lenny1.\n" -#: ../multistrap:946 +#: ../multistrap:949 #, 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:960 +#: ../multistrap:963 #, perl-format msgid "ERR: The '%s' section is not defined.\n" msgstr "ERR : la section « %s » n'est pas définie.\n" -#: ../multistrap:964 +#: ../multistrap:967 #, 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:968 +#: ../multistrap:971 msgid "No included configuration files.\n" msgstr "Pas de fichier de configuration inclus.\n" -#: ../multistrap:988 +#: ../multistrap:992 msgid "Not listed as a 'Bootstrap' section." msgstr "" -#: ../multistrap:995 +#: ../multistrap:999 msgid "Section to install" msgid_plural "Sections to install" msgstr[0] "" msgstr[1] "" -#: ../multistrap:997 +#: ../multistrap:1001 msgid "Section for updates" msgid_plural "Sections for updates" msgstr[0] "" msgstr[1] "" -#: ../multistrap:1004 +#: ../multistrap:1008 msgid "Omit deb-src from sources.list for sections:" msgstr "Omission de deb-src dans sources.list pour les sections : " -#: ../multistrap:1006 +#: ../multistrap:1010 msgid "None." msgstr "" -#: ../multistrap:1014 +#: ../multistrap:1018 msgid "Explicit suite selection: Yes\n" msgstr "Sélection des versions explicites : Oui\n" -#: ../multistrap:1016 +#: ../multistrap:1020 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:1019 +#: ../multistrap:1023 msgid "Recommended packages are added to the selection.\n" msgstr "Les paquets recommandés sont ajoutés à la sélection.\n" -#: ../multistrap:1021 +#: ../multistrap:1025 msgid "Recommended packages are ignored.\n" msgstr "Les paquets recommandés sont ignorés.\n" -#: ../multistrap:1023 +#: ../multistrap:1027 msgid "Extra Package: " msgid_plural "Extra Packages: " msgstr[0] "" msgstr[1] "" -#: ../multistrap:1029 +#: ../multistrap:1033 #, fuzzy, perl-format msgid "Architecture to download: %s\n" msgstr "Architecture : %s\n" -#: ../multistrap:1031 +#: ../multistrap:1035 #, perl-format msgid "Cannot determine architecture from '%s'.\n" msgstr "Impossible de déterminer l'architecture depuis « %s ».\n" -#: ../multistrap:1034 +#: ../multistrap:1038 #, perl-format msgid "Output directory: '%s'\n" msgstr "Répertoire de sortie : « %s »\n" -#: ../multistrap:1036 +#: ../multistrap:1040 #, perl-format msgid "Cannot determine directory from '%s'.\n" msgstr "Impossible de déterminer le répertoire depuis « %s ».\n" -#: ../multistrap:1038 +#: ../multistrap:1042 #, perl-format msgid "extract all downloaded archives: %s\n" msgstr "extrait toutes les archives téléchargées : %s\n" -#: ../multistrap:1040 +#: ../multistrap:1044 msgid "Script to be run after unpacking" msgstr "" -#: ../multistrap:1042 +#: ../multistrap:1046 msgid "'Priority required' packages are not included." msgstr "" -#: ../multistrap:1044 +#: ../multistrap:1048 msgid "'Priority: required' packages are included." msgstr "" -#: ../multistrap:1047 +#: ../multistrap:1051 msgid "remove apt cache data: true\n" msgstr "supprime les données du cache d'apt : oui\n" -#: ../multistrap:1049 +#: ../multistrap:1053 msgid "remove apt cache data: false\n" msgstr "supprime les données du cache d'apt : non\n" -#: ../multistrap:1052 +#: ../multistrap:1056 msgid "allow the use of unauthenticated repositories: true\n" msgstr "autorise l'utilisation de dépôts non signés : oui\n" -#: ../multistrap:1054 +#: ../multistrap:1058 msgid "allow the use of unauthenticated repositories: false\n" msgstr "autorise l'utilisation de dépôts non signés : non\n" -#: ../multistrap:1057 +#: ../multistrap:1061 #, perl-format msgid "Sources will be retained in: %s\n" msgstr "Les sources seront conservées dans : %s\n" -#: ../multistrap:1060 +#: ../multistrap:1064 #, perl-format msgid "Tarball name: '%s'\n" msgstr "" diff --git a/po/pt.po b/po/pt.po index 11ab9db..9cb39b8 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-10-16 12:35+0100\n" +"POT-Creation-Date: 2010-12-25 12:18+0000\n" "PO-Revision-Date: 2010-09-12 23:50+0100\n" "Last-Translator: Pedro Ribeiro \n" "Language-Team: Portuguese \n" @@ -16,33 +16,33 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../multistrap:81 +#: ../multistrap:72 msgid "Unknown option" msgstr "Opção desconhecida" -#: ../multistrap:84 +#: ../multistrap:75 #, perl-format msgid "Need a configuration file - use %s -f\n" msgstr "É necessário um ficheiro de configuração - use %s -f\n" #. Translators: fields are programname, version string, include file. #. Translators: fields are: programname, versionstring, configfile. -#: ../multistrap:97 ../multistrap:120 +#: ../multistrap:88 ../multistrap:111 #, perl-format msgid "%s %s using %s\n" msgstr "%s %s a usar %s\n" -#: ../multistrap:125 ../multistrap:127 +#: ../multistrap:116 ../multistrap:118 #, perl-format msgid "Defaulting architecture to native: %s\n" msgstr "A usar como padrão a arquitectura nativa: %s\n" -#: ../multistrap:129 +#: ../multistrap:120 #, perl-format msgid "Using foreign architecture: %s\n" msgstr "A usar arquitectura estrangeira: %s\n" -#: ../multistrap:134 +#: ../multistrap:125 #, perl-format msgid "" "No sources defined for a foreign multistrap.\n" @@ -54,77 +54,81 @@ msgstr "" "\tliste-as com aptsources= em '%s'." #. Translators: fields are: programname, architecture, host architecture. -#: ../multistrap:142 +#: ../multistrap:133 #, perl-format msgid "%s building %s multistrap on '%s'\n" msgstr "%s a criar multistrap para %s em '%s'\n" -#: ../multistrap:144 +#: ../multistrap:135 msgid "No directory specified!" msgstr "" -#: ../multistrap:150 +#: ../multistrap:141 #, perl-format msgid "Unable to create directory '%s'" msgstr "Não foi possível criar o directório '%s'" -#: ../multistrap:201 +#: ../multistrap:192 msgid "INF: ./lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "INF: link simbólico ./lib64 -> /lib reposto para ./lib.\n" -#: ../multistrap:209 +#: ../multistrap:200 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n" msgstr "INF: A definir link simbólico ./lib64 -> ./lib.\n" -#: ../multistrap:238 ../multistrap:243 ../multistrap:389 ../multistrap:394 +#: ../multistrap:229 ../multistrap:234 ../multistrap:385 ../multistrap:390 msgid "Cannot open sources list" msgstr "Impossível abrir lista de fontes" -#: ../multistrap:262 +#: ../multistrap:253 #, perl-format msgid "I: Installing %s\n" msgstr "I: A instalar %s\n" -#: ../multistrap:277 +#: ../multistrap:268 #, perl-format msgid "Unable to download keyring package: '%s'" msgstr "" -#: ../multistrap:315 +#: ../multistrap:288 +msgid "Secure Apt handling failed - try without authentication." +msgstr "" + +#: ../multistrap:311 #, perl-format msgid "Getting package lists: apt-get %s update\n" msgstr "A obter listas de pacotes: apt-get %s update\n" -#: ../multistrap:317 +#: ../multistrap:313 #, perl-format msgid "apt update failed. Exit value: %d\n" msgstr "apt update falhou. Valor de saída: %d\n" -#: ../multistrap:322 +#: ../multistrap:318 msgid "I: Calculating required packages.\n" msgstr "I: A calcular pacotes necessários\n" -#: ../multistrap:358 +#: ../multistrap:354 #, perl-format msgid "apt download failed. Exit value: %d\n" msgstr "apt download falhou. Valor de saída: %d\n" -#: ../multistrap:371 +#: ../multistrap:367 msgid "ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n" msgstr "" "ERRO: link simbólico ./lib64 -> /lib reposto para ./lib após " "desempacotamento.\n" -#: ../multistrap:372 +#: ../multistrap:368 #, perl-format msgid "ERR: Some files may have been unpacked outside %s!\n" msgstr "ERRO: Alguns ficheiros podem ter sido desempacotados fora de %s!\n" -#: ../multistrap:379 +#: ../multistrap:375 msgid "Cannot read apt sources list directory.\n" msgstr "Impossível ler directório de listas de fontes apt.\n" -#: ../multistrap:408 +#: ../multistrap:404 #, perl-format msgid "" "\n" @@ -133,7 +137,7 @@ msgstr "" "\n" "Sistema multistrap instalado com sucesso em %s.\n" -#: ../multistrap:410 +#: ../multistrap:406 #, perl-format msgid "" "\n" @@ -143,7 +147,7 @@ msgstr "" "A comprimir o sistema multistrap em '%s' para um ficheiro tar chamado: " "'%s'.\n" -#: ../multistrap:416 +#: ../multistrap:412 #, perl-format msgid "" "\n" @@ -152,7 +156,7 @@ msgstr "" "\n" "A remover directório de criação: '%s'\n" -#: ../multistrap:421 +#: ../multistrap:417 #, perl-format msgid "" "\n" @@ -161,30 +165,30 @@ msgstr "" "\n" "Sistema multistrap empacotado com sucesso como '%s'.\n" -#: ../multistrap:447 ../multistrap:488 ../multistrap:641 +#: ../multistrap:443 ../multistrap:484 ../multistrap:637 msgid "Cannot read apt archives directory.\n" msgstr "Impossível ler o directório de arquivos apt.\n" -#: ../multistrap:460 +#: ../multistrap:456 msgid "I: Calculating obsolete packages\n" msgstr "I: A calcular pacotes obsoletos\n" -#: ../multistrap:474 ../multistrap:478 +#: ../multistrap:470 ../multistrap:474 #, perl-format msgid "I: Removing %s\n" msgstr "I: A remover %s\n" -#: ../multistrap:495 +#: ../multistrap:491 #, perl-format msgid "Using directory %s for unpacking operations\n" msgstr "A usar o directório %s para operações de desempacotamento\n" -#: ../multistrap:497 +#: ../multistrap:493 #, perl-format msgid "I: Extracting %s...\n" msgstr "I: A extrair %s...\n" -#: ../multistrap:510 +#: ../multistrap:506 #, perl-format msgid "" "dpkg -X failed with error code %s\n" @@ -193,49 +197,49 @@ msgstr "" "dpkg -X falhou com o código de erro %s\n" "A saltar....\n" -#: ../multistrap:546 +#: ../multistrap:542 #, perl-format msgid " -> Processing conffiles for %s\n" msgstr " -> A processar ficheiros de configuração para %s\n" -#: ../multistrap:565 +#: ../multistrap:561 #, perl-format msgid "ERR: lib64 -> ./lib symbolic link clobbered by %s\n" msgstr "ERRO: link simbólico lib64 -> ./lib ocultado por %s\n" -#: ../multistrap:568 +#: ../multistrap:564 msgid "INF: lib64 -> /lib symbolic link reset to ./lib.\n" msgstr "INF: link simbólico lib64 -> /lib reposto para ./lib.\n" -#: ../multistrap:575 +#: ../multistrap:571 msgid "I: Unpacking complete.\n" msgstr "I: Desempacotamento completo.\n" -#: ../multistrap:588 +#: ../multistrap:584 msgid "ERR: ./bin/sh symbolic link does not exist.\n" msgstr "ERRO: link simbólico ./bin/sh não existe.\n" -#: ../multistrap:590 +#: ../multistrap:586 msgid "INF: Setting ./bin/sh -> ./bin/dash\n" msgstr "INF: A definir link simbólico ./bin/sh -> ./bin/dash\n" -#: ../multistrap:595 +#: ../multistrap:591 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:610 +#: ../multistrap:606 msgid "I: Tidying up apt cache and list data.\n" msgstr "I: A arrumar dados de lista e de apt cache.\n" -#: ../multistrap:623 +#: ../multistrap:619 msgid "Cannot read apt lists directory.\n" msgstr "Impossível ler directório de listas apt.\n" -#: ../multistrap:631 +#: ../multistrap:627 msgid "Cannot read apt cache directory.\n" msgstr "Impossível ler directório de cache apt.\n" -#: ../multistrap:663 +#: ../multistrap:659 #, perl-format msgid "" "I: dpkg configuration settings:\n" @@ -244,7 +248,7 @@ msgstr "" "I: opções de configuração do dpkg:\n" "\t%s\n" -#: ../multistrap:665 +#: ../multistrap:661 msgid "" "W: Cannot use 'chroot' when fakeroot is in use. Skipping package " "configuration.\n" @@ -254,35 +258,35 @@ msgstr "" # msgid "Cannot read apt archives directory.\n" # msgstr "Impossível ler directório/ de arquivos apt.\n" -#: ../multistrap:668 +#: ../multistrap:664 msgid "I: Native mode - configuring unpacked packages . . .\n" msgstr "I: Modo nativo - a configurar pacotes desempacotados . . .\n" -#: ../multistrap:679 +#: ../multistrap:675 msgid "I: Running preinst scripts with 'upgrade' argument.\n" msgstr "I: A correr scripts 'preinst' com o argumento 'upgrade'.\n" -#: ../multistrap:702 +#: ../multistrap:698 #, perl-format msgid "Cannot open %s directory. %s\n" msgstr "Impossível abrir o directório %s. %s\n" -#: ../multistrap:733 +#: ../multistrap:729 #, perl-format msgid "cannot open apt sources list. %s" msgstr "impossível abrir lista de fontes apt. %s" -#: ../multistrap:739 +#: ../multistrap:735 #, perl-format msgid "cannot open apt sources.list directory %s\n" msgstr "impossível abrir directório de apt sources.list %s\n" -#: ../multistrap:744 +#: ../multistrap:740 #, perl-format msgid "cannot open /etc/apt/sources.list.d/%s %s" msgstr "impossível abrir /etc/apt/sources.list.d/%s %s" -#: ../multistrap:756 +#: ../multistrap:752 #, fuzzy, perl-format msgid "" "\n" @@ -422,16 +426,21 @@ msgstr "" "será criado - não será empacotado num .tgz após ficar completo.\n" "\n" -#: ../multistrap:822 +#: ../multistrap:818 msgid "failed to write usage:" msgstr "falhou a escrita do modo de utilização:" -#: ../multistrap:880 +#: ../multistrap:825 +#, perl-format +msgid "Failed to parse '%s'!\n" +msgstr "" + +#: ../multistrap:879 #, perl-format msgid "ERR: Cannot find include file: '%s' for '%s'" msgstr "" -#: ../multistrap:926 +#: ../multistrap:929 #, perl-format msgid "" "ERROR: Your version of apt is too old to support using a codename like '%s'. " @@ -447,132 +456,132 @@ msgstr "" "'experimental'.Em alternativa, actualize o apt para uma versão mais recente " "que 0.7.20.2+lenny1.\n" -#: ../multistrap:946 +#: ../multistrap:949 #, 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:960 +#: ../multistrap:963 #, perl-format msgid "ERR: The '%s' section is not defined.\n" msgstr "ERR: A secção '%s' não está definida.\n" -#: ../multistrap:964 +#: ../multistrap:967 #, 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:968 +#: ../multistrap:971 msgid "No included configuration files.\n" msgstr "Não foram incluídos ficheiros de configuração.\n" -#: ../multistrap:988 +#: ../multistrap:992 msgid "Not listed as a 'Bootstrap' section." msgstr "" -#: ../multistrap:995 +#: ../multistrap:999 msgid "Section to install" msgid_plural "Sections to install" msgstr[0] "" msgstr[1] "" -#: ../multistrap:997 +#: ../multistrap:1001 msgid "Section for updates" msgid_plural "Sections for updates" msgstr[0] "" msgstr[1] "" -#: ../multistrap:1004 +#: ../multistrap:1008 msgid "Omit deb-src from sources.list for sections:" msgstr "Omitir deb-src do sources.list para as secções:" -#: ../multistrap:1006 +#: ../multistrap:1010 msgid "None." msgstr "" -#: ../multistrap:1014 +#: ../multistrap:1018 msgid "Explicit suite selection: Yes\n" msgstr "Selecção explícita de 'suite': Sim\n" -#: ../multistrap:1016 +#: ../multistrap:1020 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:1019 +#: ../multistrap:1023 msgid "Recommended packages are added to the selection.\n" msgstr "Pacotes recomendados são acrescentados à selecção.\n" -#: ../multistrap:1021 +#: ../multistrap:1025 msgid "Recommended packages are ignored.\n" msgstr "Pacotes recomendados são ignorados.\n" -#: ../multistrap:1023 +#: ../multistrap:1027 msgid "Extra Package: " msgid_plural "Extra Packages: " msgstr[0] "" msgstr[1] "" -#: ../multistrap:1029 +#: ../multistrap:1033 #, fuzzy, perl-format msgid "Architecture to download: %s\n" msgstr "Arquitectura: %s\n" -#: ../multistrap:1031 +#: ../multistrap:1035 #, perl-format msgid "Cannot determine architecture from '%s'.\n" msgstr "Impossível determinar a arquitectura a partir de '%s'.\n" -#: ../multistrap:1034 +#: ../multistrap:1038 #, perl-format msgid "Output directory: '%s'\n" msgstr "Directório de saída: '%s'\n" -#: ../multistrap:1036 +#: ../multistrap:1040 #, perl-format msgid "Cannot determine directory from '%s'.\n" msgstr "Impossível determinar o directório a partir de '%s'.\n" -#: ../multistrap:1038 +#: ../multistrap:1042 #, perl-format msgid "extract all downloaded archives: %s\n" msgstr "extrair todos os arquivos descarregados: %s\n" -#: ../multistrap:1040 +#: ../multistrap:1044 msgid "Script to be run after unpacking" msgstr "" -#: ../multistrap:1042 +#: ../multistrap:1046 msgid "'Priority required' packages are not included." msgstr "" -#: ../multistrap:1044 +#: ../multistrap:1048 msgid "'Priority: required' packages are included." msgstr "" -#: ../multistrap:1047 +#: ../multistrap:1051 msgid "remove apt cache data: true\n" msgstr "remover cache de dados do apt: verdadeiro\n" -#: ../multistrap:1049 +#: ../multistrap:1053 msgid "remove apt cache data: false\n" msgstr "remover cache de dados do apt: falso\n" -#: ../multistrap:1052 +#: ../multistrap:1056 msgid "allow the use of unauthenticated repositories: true\n" msgstr "permitir o uso de repositórios não autenticados: verdadeiro\n" -#: ../multistrap:1054 +#: ../multistrap:1058 msgid "allow the use of unauthenticated repositories: false\n" msgstr "permitir o uso de repositórios não autenticados: falso\n" -#: ../multistrap:1057 +#: ../multistrap:1061 #, perl-format msgid "Sources will be retained in: %s\n" msgstr "Fontes serão guardadas em: %s\n" -#: ../multistrap:1060 +#: ../multistrap:1064 #, perl-format msgid "Tarball name: '%s'\n" msgstr "" diff --git a/po/vi.po b/po/vi.po index 0f5f4d9..0f8d958 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-10-16 12:35+0100\n" +"POT-Creation-Date: 2010-12-25 12:18+0000\n" "PO-Revision-Date: 2010-09-29 19:59+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -17,33 +17,33 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.8\n" -#: ../multistrap:81 +#: ../multistrap:72 msgid "Unknown option" msgstr "Không rõ tuỳ chọn" -#: ../multistrap:84 +#: ../multistrap:75 #, perl-format msgid "Need a configuration file - use %s -f\n" msgstr "Yêu cầu một tập tin cấu hình: dùng « %s -f »\n" #. Translators: fields are programname, version string, include file. #. Translators: fields are: programname, versionstring, configfile. -#: ../multistrap:97 ../multistrap:120 +#: ../multistrap:88 ../multistrap:111 #, perl-format msgid "%s %s using %s\n" msgstr "%s %s dùng %s\n" -#: ../multistrap:125 ../multistrap:127 +#: ../multistrap:116 ../multistrap:118 #, 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:129 +#: ../multistrap:120 #, perl-format msgid "Using foreign architecture: %s\n" msgstr "Dùng kiến trúc ngoài: %s\n" -#: ../multistrap:134 +#: ../multistrap:125 #, perl-format msgid "" "No sources defined for a foreign multistrap.\n" @@ -56,79 +56,83 @@ msgstr "" "\tdùng cú pháp « aptsources= »." #. Translators: fields are: programname, architecture, host architecture. -#: ../multistrap:142 +#: ../multistrap:133 #, perl-format msgid "%s building %s multistrap on '%s'\n" msgstr "%s đang xây dựng multistrap %s trên « %s »\n" -#: ../multistrap:144 +#: ../multistrap:135 msgid "No directory specified!" msgstr "" -#: ../multistrap:150 +#: ../multistrap:141 #, perl-format msgid "Unable to create directory '%s'" msgstr "Không thể tạo thư mục « %s »" -#: ../multistrap:201 +#: ../multistrap:192 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:209 +#: ../multistrap:200 msgid "INF: Setting ./lib64 -> ./lib symbolic link.\n" msgstr "TIN: Đang đặt liên kết tượng trưng « ./lib64 » -> « ./lib ».\n" -#: ../multistrap:238 ../multistrap:243 ../multistrap:389 ../multistrap:394 +#: ../multistrap:229 ../multistrap:234 ../multistrap:385 ../multistrap:390 msgid "Cannot open sources list" msgstr "Không mở được danh sách nguồn" -#: ../multistrap:262 +#: ../multistrap:253 #, perl-format msgid "I: Installing %s\n" msgstr "TIN: Đang cài đặt %s\n" -#: ../multistrap:277 +#: ../multistrap:268 #, perl-format msgid "Unable to download keyring package: '%s'" msgstr "" +#: ../multistrap:288 +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:315 +#: ../multistrap:311 #, 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:317 +#: ../multistrap:313 #, 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:322 +#: ../multistrap:318 msgid "I: Calculating required packages.\n" msgstr "TIN: Đang tính các gói yêu cầu.\n" -#: ../multistrap:358 +#: ../multistrap:354 #, perl-format msgid "apt download failed. Exit value: %d\n" msgstr "Tiến trình « apt download » (tải về) bị lỗi. Giá trị thoát: %d\n" -#: ../multistrap:371 +#: ../multistrap:367 msgid "ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n" msgstr "" "LỖI: Liên kết tượng trưng « ./lib64 » -> « /lib » bị đặt lại thành « ./lib » " "sau khi mở gói.\n" -#: ../multistrap:372 +#: ../multistrap:368 #, perl-format msgid "ERR: Some files may have been unpacked outside %s!\n" msgstr "LỖI: Một số tập tin nào đó có thể bị mở gói bên ngoài %s !\n" -#: ../multistrap:379 +#: ../multistrap:375 msgid "Cannot read apt sources list directory.\n" msgstr "Không đọc được thư mục danh sách nguồn apt.\n" -#: ../multistrap:408 +#: ../multistrap:404 #, perl-format msgid "" "\n" @@ -138,7 +142,7 @@ msgstr "" "Hệ thống multistrap đã được cài đặt thành công vào %s.\n" "\n" -#: ../multistrap:410 +#: ../multistrap:406 #, perl-format msgid "" "\n" @@ -147,7 +151,7 @@ msgstr "" "\n" "Đang nén hệ thống multistrap trong « %s » thành một kho lưu tên: « %s ».\n" -#: ../multistrap:416 +#: ../multistrap:412 #, perl-format msgid "" "\n" @@ -156,7 +160,7 @@ msgstr "" "\n" "Đang gỡ bỏ thư mục xây dựng: « %s »\n" -#: ../multistrap:421 +#: ../multistrap:417 #, perl-format msgid "" "\n" @@ -166,30 +170,30 @@ msgstr "" "Hệ thống multistrap đã được đóng gói thành công thành « %s ».\n" "\n" -#: ../multistrap:447 ../multistrap:488 ../multistrap:641 +#: ../multistrap:443 ../multistrap:484 ../multistrap:637 msgid "Cannot read apt archives directory.\n" msgstr "Không đọc được thư mục kho lưu apt.\n" -#: ../multistrap:460 +#: ../multistrap:456 msgid "I: Calculating obsolete packages\n" msgstr "TIN: Đang tính các gói cũ\n" -#: ../multistrap:474 ../multistrap:478 +#: ../multistrap:470 ../multistrap:474 #, perl-format msgid "I: Removing %s\n" msgstr "TIN: Đang gỡ bỏ %s\n" -#: ../multistrap:495 +#: ../multistrap:491 #, 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:497 +#: ../multistrap:493 #, perl-format msgid "I: Extracting %s...\n" msgstr "TIN: Đang giải nén %s...\n" -#: ../multistrap:510 +#: ../multistrap:506 #, perl-format msgid "" "dpkg -X failed with error code %s\n" @@ -198,52 +202,52 @@ msgstr "" "« dpkg -X » bị lỗi với mã lỗi %s\n" "Đang bỏ qua...\n" -#: ../multistrap:546 +#: ../multistrap:542 #, 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:565 +#: ../multistrap:561 #, 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:568 +#: ../multistrap:564 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:575 +#: ../multistrap:571 msgid "I: Unpacking complete.\n" msgstr "TIN: Hoàn tất mở gói.\n" -#: ../multistrap:588 +#: ../multistrap:584 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:590 +#: ../multistrap:586 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:595 +#: ../multistrap:591 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:610 +#: ../multistrap:606 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:623 +#: ../multistrap:619 msgid "Cannot read apt lists directory.\n" msgstr "Không đọc được thư mục danh sách apt.\n" -#: ../multistrap:631 +#: ../multistrap:627 msgid "Cannot read apt cache directory.\n" msgstr "Không đọc được thư mục nhớ tạm apt.\n" -#: ../multistrap:663 +#: ../multistrap:659 #, perl-format msgid "" "I: dpkg configuration settings:\n" @@ -252,7 +256,7 @@ msgstr "" "TIN: Thiết lập cấu hình dpkg:\n" "\t%s\n" -#: ../multistrap:665 +#: ../multistrap:661 msgid "" "W: Cannot use 'chroot' when fakeroot is in use. Skipping package " "configuration.\n" @@ -260,36 +264,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:668 +#: ../multistrap:664 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:679 +#: ../multistrap:675 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:702 +#: ../multistrap:698 #, perl-format msgid "Cannot open %s directory. %s\n" msgstr "Không mở được thư mục %s. %s\n" -#: ../multistrap:733 +#: ../multistrap:729 #, perl-format msgid "cannot open apt sources list. %s" msgstr "không mở được danh sách nguồn apt. %s" -#: ../multistrap:739 +#: ../multistrap:735 #, 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:744 +#: ../multistrap:740 #, 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:756 +#: ../multistrap:752 #, fuzzy, perl-format msgid "" "\n" @@ -430,16 +434,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:822 +#: ../multistrap:818 msgid "failed to write usage:" msgstr "lỗi ghi cách sử dụng:" -#: ../multistrap:880 +#: ../multistrap:825 +#, perl-format +msgid "Failed to parse '%s'!\n" +msgstr "" + +#: ../multistrap:879 #, perl-format msgid "ERR: Cannot find include file: '%s' for '%s'" msgstr "" -#: ../multistrap:926 +#: ../multistrap:929 #, perl-format msgid "" "ERROR: Your version of apt is too old to support using a codename like '%s'. " @@ -459,128 +468,128 @@ 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:946 +#: ../multistrap:949 #, 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:960 +#: ../multistrap:963 #, perl-format msgid "ERR: The '%s' section is not defined.\n" msgstr "LỖI: chưa xác định phần « %s ».\n" -#: ../multistrap:964 +#: ../multistrap:967 #, 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:968 +#: ../multistrap:971 msgid "No included configuration files.\n" msgstr "Không bao gồm tập tin cấu hình nào.\n" -#: ../multistrap:988 +#: ../multistrap:992 msgid "Not listed as a 'Bootstrap' section." msgstr "" -#: ../multistrap:995 +#: ../multistrap:999 msgid "Section to install" msgid_plural "Sections to install" msgstr[0] "" -#: ../multistrap:997 +#: ../multistrap:1001 msgid "Section for updates" msgid_plural "Sections for updates" msgstr[0] "" -#: ../multistrap:1004 +#: ../multistrap:1008 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:1006 +#: ../multistrap:1010 msgid "None." msgstr "" -#: ../multistrap:1014 +#: ../multistrap:1018 msgid "Explicit suite selection: Yes\n" msgstr "Chọn dứt khoát bộ ứng dụng: Có\n" -#: ../multistrap:1016 +#: ../multistrap:1020 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:1019 +#: ../multistrap:1023 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:1021 +#: ../multistrap:1025 msgid "Recommended packages are ignored.\n" msgstr "Các gói khuyến khích bị bỏ qua.\n" -#: ../multistrap:1023 +#: ../multistrap:1027 msgid "Extra Package: " msgid_plural "Extra Packages: " msgstr[0] "" -#: ../multistrap:1029 +#: ../multistrap:1033 #, fuzzy, perl-format msgid "Architecture to download: %s\n" msgstr "Kiến trúc: %s\n" -#: ../multistrap:1031 +#: ../multistrap:1035 #, perl-format msgid "Cannot determine architecture from '%s'.\n" msgstr "Không thể quyết định kiến trúc từ « %s ».\n" -#: ../multistrap:1034 +#: ../multistrap:1038 #, perl-format msgid "Output directory: '%s'\n" msgstr "Thư mục kết xuất: « %s »\n" -#: ../multistrap:1036 +#: ../multistrap:1040 #, perl-format msgid "Cannot determine directory from '%s'.\n" msgstr "Không thể quyết định thư mục từ « %s ».\n" -#: ../multistrap:1038 +#: ../multistrap:1042 #, 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:1040 +#: ../multistrap:1044 msgid "Script to be run after unpacking" msgstr "" -#: ../multistrap:1042 +#: ../multistrap:1046 msgid "'Priority required' packages are not included." msgstr "" -#: ../multistrap:1044 +#: ../multistrap:1048 msgid "'Priority: required' packages are included." msgstr "" -#: ../multistrap:1047 +#: ../multistrap:1051 msgid "remove apt cache data: true\n" msgstr "gỡ bỏ dữ liệu nhớ tạm apt: đúng\n" -#: ../multistrap:1049 +#: ../multistrap:1053 msgid "remove apt cache data: false\n" msgstr "gỡ bỏ dữ liệu nhớ tạm apt: sai\n" -#: ../multistrap:1052 +#: ../multistrap:1056 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:1054 +#: ../multistrap:1058 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:1057 +#: ../multistrap:1061 #, perl-format msgid "Sources will be retained in: %s\n" msgstr "Các nguồn sẽ được giữ lại trong: %s\n" -#: ../multistrap:1060 +#: ../multistrap:1064 #, perl-format msgid "Tarball name: '%s'\n" msgstr ""