-- cgit v1.2.3 From d9e050800067f16ba49cb6932d7a52a6de22ab9d Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sat, 25 Jun 2005 23:52:00 +0000 Subject: Merge from Debian branch Patches applied: * apt@packages.debian.org/apt--main--0--patch-89 Branch for Debian * apt@packages.debian.org/apt--main--0--patch-90 Update version in configure * apt@packages.debian.org/apt--main--0--patch-91 Fix French man page build * apt@packages.debian.org/apt--main--0--patch-92 Add the current Debian archive signing key * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6 * build fix for apt--main--0 --- cmdline/apt-key | 6 +++--- configure.in | 2 +- debian/apt.postinst | 2 +- debian/changelog | 12 ++++++++++++ debian/rules | 2 +- doc/fr/makefile | 46 ++++++++++++++++++++++++++++++++++++++++++++-- po/he.po | 4 ++-- share/debian-archive.gpg | Bin 477 -> 1303 bytes 8 files changed, 64 insertions(+), 10 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index be2b19a1a..0685e36f7 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" -ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the ubuntu-keyring package installed?" + echo >&2 "Is the debian-keyring package installed?" exit 1 fi diff --git a/configure.in b/configure.in index 767399b52..aa827cec1 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.37") +AC_DEFINE_UNQUOTED(VERSION,"0.6.38") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.postinst b/debian/apt.postinst index df0433057..ae1801198 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/changelog b/debian/changelog index 57b746a56..be201057c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.6.38) unstable; urgency=low + + * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround + for the French man pages' failure to build + * Branch Debian and Ubuntu + - apt.postinst, apt-key: use the appropriate keyring + - debian/rules: install all keyrings + * Add the current Debian archive signing key (4F368D5D) to + debian-archive.gpg + + -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 + apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 diff --git a/debian/rules b/debian/rules index e3254c2d2..d6ae540ee 100755 --- a/debian/rules +++ b/debian/rules @@ -209,7 +209,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + cp share/*.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog diff --git a/doc/fr/makefile b/doc/fr/makefile index 6544ee9e0..c0e7fa7ed 100644 --- a/doc/fr/makefile +++ b/doc/fr/makefile @@ -8,6 +8,48 @@ include ../../buildlib/defaults.mak # Man pages SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \ sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \ - apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 + apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 \ + apt-key.fr.8 + INCLUDES = apt.ent.fr -include $(XML_MANPAGE_H) + +doc: $(SOURCE) + +$(SOURCE) :: % : %.xml $(INCLUDES) + echo Creating man page $@ + $(XMLTO) man $< + +apt-cache.fr.8:: apt-cache.8 + cp $< $@ + +apt-get.fr.8:: apt-get.8 + cp $< $@ + +apt-cdrom.fr.8:: apt-cdrom.8 + cp $< $@ + +apt.conf.fr.5:: apt.conf.5 + cp $< $@ + +apt-config.fr.8:: apt-config.8 + cp $< $@ + +sources.list.fr.5:: sources.list.5 + cp $< $@ + +apt-sortpkgs.fr.1:: apt-sortpkgs.1 + cp $< $@ + +apt-ftparchive.fr.1:: apt-ftparchive.1 + cp $< $@ + +apt_preferences.fr.5:: apt_preferences.5 + cp $< $@ + +apt-extracttemplates.fr.1:: apt-extracttemplates.1 + cp $< $@ + +apt-key.fr.8:: apt-key.8 + cp $< $@ + + diff --git a/po/he.po b/po/he.po index e2aea1c77..242155eff 100644 --- a/po/he.po +++ b/po/he.po @@ -639,8 +639,8 @@ msgstr "לא מצליח לתקן תלויות" #: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" msgstr "" -+"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" -+"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" +"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" +"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" #: cmdline/apt-get.cc:658 msgid " Done" diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg index 0db59e674..c391d8fa1 100644 Binary files a/share/debian-archive.gpg and b/share/debian-archive.gpg differ -- cgit v1.2.3 From c9fa6271e4813d88284771ff15050165eac38353 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sat, 25 Jun 2005 23:53:43 +0000 Subject: 0.6.38ubuntu1 --- cmdline/apt-key | 6 +++--- configure.in | 2 +- debian/apt.postinst | 2 +- debian/changelog | 7 +++++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 0685e36f7..be2b19a1a 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" -ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the debian-keyring package installed?" + echo >&2 "Is the ubuntu-keyring package installed?" exit 1 fi diff --git a/configure.in b/configure.in index aa827cec1..2f7fd611a 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.38") +AC_DEFINE_UNQUOTED(VERSION,"0.6.38ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.postinst b/debian/apt.postinst index ae1801198..df0433057 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/changelog b/debian/changelog index be201057c..a249d92f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.38ubuntu1) breezy; urgency=low + + * First release from Ubuntu branch + * Merge with --main--0, switch back to Ubuntu keyring + + -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 + apt (0.6.38) unstable; urgency=low * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround -- cgit v1.2.3 From 20edfd5399dada2d10ad791336797c4118eb60a8 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sun, 26 Jun 2005 20:13:10 +0000 Subject: Merge with mainline Patches applied: * apt@packages.debian.org/apt--main--0--patch-93 Merge with mvo * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-22 * added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-23 * apt-cache show shows all virtual packages instead of nothing (thanks to otavio) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-24 * changelog updated * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-25 * make pinning on component work again (we just use the section, as apt-0.6 don't use per-section Release files anymore) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-27 * updated the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-28 * merged with my apt--fixes--0 branch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-29 * added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/ * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-30 * fix a stupid bug in the depcache::Init() code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-31 * merged/removed conflicts with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 * merged apt--main and make sure that the po files come from apt--main (because they are more recent) --- apt-pkg/deb/debindexfile.cc | 4 ++-- apt-pkg/deb/deblistparser.cc | 11 +++++++++-- apt-pkg/deb/deblistparser.h | 3 ++- apt-pkg/depcache.cc | 3 +++ debian/changelog | 5 ++++- debian/control | 2 +- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index f26265fff..ff8bce85d 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -24,7 +24,7 @@ #include #include #include - + #include /*}}}*/ @@ -290,7 +290,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const FileFd Rel(ReleaseFile,FileFd::ReadOnly); if (_error->PendingError() == true) return false; - Parser.LoadReleaseInfo(File,Rel); + Parser.LoadReleaseInfo(File,Rel,Section); } return true; diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 96a80582d..25b533773 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -564,13 +564,20 @@ bool debListParser::Step() // --------------------------------------------------------------------- /* */ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, - FileFd &File) + FileFd &File, string component) { pkgTagFile Tags(&File, File.Size() + 256); // XXX pkgTagSection Section; if (Tags.Step(Section) == false) return false; + //mvo: I don't think we need to fill that in (it's unused since apt-0.6) + //FileI->Architecture = WriteUniqString(Arch); + + // apt-secure does no longer download individual (per-section) Release + // file. to provide Component pinning we use the section name now + FileI->Component = WriteUniqString(component); + const char *Start; const char *Stop; if (Section.Find("Suite",Start,Stop) == true) @@ -589,7 +596,7 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, if (Section.FindFlag("NotAutomatic",FileI->Flags, pkgCache::Flag::NotAutomatic) == false) _error->Warning("Bad NotAutomatic flag"); - + return !_error->PendingError(); } /*}}}*/ diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 9f305211a..3a0e0421b 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -55,7 +55,8 @@ class debListParser : public pkgCacheGenerator::ListParser virtual bool Step(); - bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File); + bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File, + string section); static const char *ParseDepends(const char *Start,const char *Stop, string &Package,string &Ver,unsigned int &Op, diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index c6bf3185a..dd1c794c9 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -91,6 +91,9 @@ bool pkgDepCache::Init(OpProgress *Prog) } Update(Prog); + + if(Prog != 0) + Prog->Done(); return true; } diff --git a/debian/changelog b/debian/changelog index a249d92f4..d71a78e71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,10 @@ apt (0.6.38) unstable; urgency=low - debian/rules: install all keyrings * Add the current Debian archive signing key (4F368D5D) to debian-archive.gpg - + * make pinning on the "component" work again (using the section of the + archive, we don't use per-section Release files anymore with apt-0.6) + (closes ubuntu #9935) + -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 apt (0.6.37) breezy; urgency=low diff --git a/debian/control b/debian/control index b7c430997..9dd271619 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: apt Section: admin Priority: important Maintainer: APT Development Team -Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman +Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1 Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) -- cgit v1.2.3 From 602afa46935a1015ae9d07a016b4b4cc199205a2 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sun, 26 Jun 2005 20:13:53 +0000 Subject: Improved arch-build rule --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d6ae540ee..ee02baeb6 100755 --- a/debian/rules +++ b/debian/rules @@ -336,4 +336,4 @@ arch-build: mkdir -p debian/arch-build/apt-$(APT_DEBVER) baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER) $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc - (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG)) + (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes) -- cgit v1.2.3 From 99f9dc4c97a7eef6b2819c933be0fc947f747912 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sun, 26 Jun 2005 21:28:56 +0000 Subject: Merge with mainline Patches applied: * andrelop@debian.org/apt--translation--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * andrelop@debian.org/apt--translation--0--patch-1 Sync with Matt version. * andrelop@debian.org/apt--translation--0--patch-2 Update pt_BR translation * andrelop@debian.org/apt--translation--0--patch-3 Sync with bubulle's branch. * apt@packages.debian.org/apt--main--0--patch-94 Update changelog * apt@packages.debian.org/apt--main--0--patch-95 Merge Christian's branch * apt@packages.debian.org/apt--main--0--patch-96 Update changelog * apt@packages.debian.org/apt--main--0--patch-97 Update priority of apt-utils to important, to match the override file * bubulle@debian.org--2005/apt--main--0--patch-82 Fix permissions * bubulle@debian.org--2005/apt--main--0--patch-83 French translation spellchecked * bubulle@debian.org--2005/apt--main--0--patch-84 Spell corrections in German translations * bubulle@debian.org--2005/apt--main--0--patch-85 Correct some file permissions * bubulle@debian.org--2005/apt--main--0--patch-86 Correct Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-87 Sync Portuguese translation with the POT file * bubulle@debian.org--2005/apt--main--0--patch-88 Updated Danish translation (not yet complete) * bubulle@debian.org--2005/apt--main--0--patch-89 Sync with Andre Luis Lopes and Otavio branches --- cmdline/apt-key | 6 +- debian/apt.postinst | 2 +- debian/changelog | 27 ++++ debian/control | 2 +- po/da.po | 111 ++++++++-------- po/de.po | 53 ++++---- po/fr.po | 339 ++++++++++++++++++++++++++++++++++++++++------- po/he.po | 3 +- po/pt.po | 59 +++------ po/pt_BR.po | 149 +++++++++++---------- share/debian-archive.gpg | Bin 1303 -> 0 bytes 11 files changed, 499 insertions(+), 252 deletions(-) delete mode 100644 share/debian-archive.gpg diff --git a/cmdline/apt-key b/cmdline/apt-key index be2b19a1a..0685e36f7 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" -ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the ubuntu-keyring package installed?" + echo >&2 "Is the debian-keyring package installed?" exit 1 fi diff --git a/debian/apt.postinst b/debian/apt.postinst index df0433057..ae1801198 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/changelog b/debian/changelog index d71a78e71..2ff5dd8c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +apt (0.6.39) unstable; urgency=low + + * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 + * Merge mvo's changes from 0.6.36ubuntu1: + michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 + * Merge aggregated translation updates: + bubulle@debian.org--2005/apt--main--0 + * Update priority of apt-utils to important, to match the override file + + -- + apt (0.6.38ubuntu1) breezy; urgency=low * First release from Ubuntu branch @@ -20,6 +31,22 @@ apt (0.6.38) unstable; urgency=low -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 +apt (0.6.38) unstable; urgency=low + + * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround + for the French man pages' failure to build + * Branch Debian and Ubuntu + - apt.postinst, apt-key: use the appropriate keyring + - debian/rules: install all keyrings + * Add the current Debian archive signing key (4F368D5D) to + debian-archive.gpg + * make pinning on the "component" work again (using the section of the + archive, we don't use per-section Release files anymore with apt-0.6) + (closes ubuntu #9935) + + -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 + +>>>>>>> MERGE-SOURCE apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 diff --git a/debian/control b/debian/control index 9dd271619..6d9418a46 100644 --- a/debian/control +++ b/debian/control @@ -53,7 +53,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends} -Priority: optional +Priority: important Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) Section: admin diff --git a/po/da.po b/po/da.po index feade5c60..7d8f3508f 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-10 20:50+0100\n" +"PO-Revision-Date: 2005-06-23 10:46+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgstr " Rene virtuelle pakker: " #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr " Enkelt-virtuelle pakker: " +msgstr " Enkelte virtuelle pakker: " #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " @@ -259,7 +259,7 @@ msgstr "" " shell - Skal-tilstand\n" " dump - Vis opstningen\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst.\n" " -c=? Ls denne opstningsfil\n" " -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n" @@ -287,7 +287,7 @@ msgstr "" "apt-extracttemplates er et vrktj til at uddrage opstnings- og skabelon-" "oplysninger fra Debianpakker\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst\n" " -t Angiv temp-mappe\n" " -c=? Ls denne opstningsfil\n" @@ -327,7 +327,6 @@ msgid "Error processing contents %s" msgstr "Fejl under behandling af indhold %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -400,10 +399,10 @@ msgstr "" " -h Denne hjlpetekst\n" " --md5 Styr generering af MD5\n" " -s=? Kilde-tvangsfil\n" -" -q Stille (vis frre statusbeskeder)\n" +" -q Stille\n" " -d=? Vlg den valgfrie mellemlager-database\n" -" --no-delink Aktivr \"delinking\" fejlsporingstilstand\n" -" --contents Bestem generering af inholdsfil\n" +" --no-delink Aktivr \"delinking\"-fejlsporingstilstand\n" +" --contents Bestem generering af indholdsfil\n" " -c=? Ls denne opstningsfil\n" " -o=? St en opstnings-indstilling" @@ -600,7 +599,7 @@ msgstr "Kunne ikke udf #: ftparchive/multicompress.cc:363 msgid "decompressor" -msgstr "dekompressions-program" +msgstr "dekomprimerings-program" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" @@ -669,7 +668,7 @@ msgstr "F #: cmdline/apt-get.cc:399 msgid "The following packages will be REMOVED:" -msgstr "Flgende pakker vil blive FJERNET:" +msgstr "Flgende pakker vil blive AFINSTALLERET:" #: cmdline/apt-get.cc:421 msgid "The following packages have been kept back:" @@ -697,33 +696,33 @@ msgid "" "WARNING: The following essential packages will be removed\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ADVARSEL: Flgende essentielle pakker vil blive fjernet\n" +"ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n" "Dette br IKKE ske medmindre du er helt klar over, hvad du laver!" #: cmdline/apt-get.cc:575 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu opgraderede, %lu netop installerede, " +msgstr "%lu opgraderes, %lu nyinstalleres, " #: cmdline/apt-get.cc:579 #, c-format msgid "%lu reinstalled, " -msgstr "%lu geninstallerede, " +msgstr "%lu geninstalleres, " #: cmdline/apt-get.cc:581 #, c-format msgid "%lu downgraded, " -msgstr "%lu nedgraderede, " +msgstr "%lu nedgraderes, " #: cmdline/apt-get.cc:583 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu at fjerne og %lu ikke opgraderede.\n" +msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" #: cmdline/apt-get.cc:587 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu ikke fuldstndigt installerede eller fjernede.\n" +msgstr "%lu ikke fuldstndigt installerede eller afinstallerede.\n" #: cmdline/apt-get.cc:647 msgid "Correcting dependencies..." @@ -771,7 +770,7 @@ msgstr "Der er problemer og -y blev brugt uden --force-yes" #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." -msgstr "Pakker skal fjernes, men Remove er deaktiveret." +msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 msgid "Unable to lock the download directory" @@ -882,7 +881,7 @@ msgstr "" #: cmdline/apt-get.cc:1054 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Pakken %s er ikke installeret, s den fjernes ikke\n" +msgstr "Pakken %s er ikke installeret, s den afinstalleres ikke\n" #: cmdline/apt-get.cc:1065 #, c-format @@ -1197,13 +1196,13 @@ msgstr "" " update - Hent nye lister over pakker\n" " upgrade - Udfr en opgradering\n" " install - Installr nye pakker (pakke er libc6, ikke libc6.deb)\n" -" remove - Fjern pakker\n" +" remove - Afinstallr pakker\n" " source - Hent kildetekstarkiver\n" " build-dep - St opbygningsafhngigheder op for kildetekstpakker\n" " dist-upgrade - Distributionsopgradering, se apt-get(8)\n" " dselect-upgrade - Flg valgene fra dselect\n" -" clean - Fjern hentede arkivfiler\n" -" autoclean - Fjern gamle hentede arkivfiler\n" +" clean - Slet hentede arkivfiler\n" +" autoclean - Slet gamle hentede arkivfiler\n" " check - Tjek at der ikke er uopfyldte afhngigheder\n" "\n" "Tilvalg:\n" @@ -1283,7 +1282,7 @@ msgstr "" "apt-sortpkgs er et simpelt vrktj til at sortere pakkefiler. Tilvalget -s\n" "bruges til at angive filens type.\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst\n" " -s Benyt kildefils-sortering\n" " -c=? Ls denne opstningsfil\n" @@ -1367,7 +1366,7 @@ msgstr "Kunne ikke l #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "DropNode kaldt med endnu-forbundet knude" +msgstr "DropNode kaldt med endnu forbundet knude" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" @@ -1467,7 +1466,7 @@ msgstr "Kunne ikke finde %s" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" -msgstr "Kunne ikke fjerne %s" +msgstr "Kunne ikke slette %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format @@ -1544,7 +1543,8 @@ msgid "Internal error adding a diversion" msgstr "Intern fejl under tilfjelse af omrokering" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialized first" +#, fuzzy +msgid "The pkg cache must be initialize first" msgstr "pkg-mellemlageret skal initialiseres frst" #: apt-inst/deb/dpkgdb.cc:386 @@ -2234,17 +2234,17 @@ msgstr "Ugyldig linje %lu i kildelisten %s (dist)" #: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Ugyldig linje %lu i kildelisten %s (URI parse)" +msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" #: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Ugyldig linje %lu i kildelisten %s (absolute dist)" +msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Ugyldig linje %lu i kildelisten %s (dist parse)" +msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2269,7 +2269,7 @@ msgstr "Typen '%s' er ukendt p #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Ugyldig linje %u i kildelisten %s (vendor id)" +msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2278,9 +2278,10 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Krsel af denne installation krver midlertidig fjernelse af den essentielle " -"pakke %s grundet en afhngighedslkke. Det er ofte en drlig id, men hvis " -"du virkelig vil gre det, kan du aktivere valget 'APT::Force-LoopBreak'." +"Krsel af denne installation krver midlertidig afinstallation af den " +"essentielle pakke %s grundet en afhngighedslkke. Det er ofte en drlig " +"id, men hvis du virkelig vil gre det, kan du aktivere valget 'APT::Force-" +"LoopBreak'." #: apt-pkg/pkgrecords.cc:37 #, c-format @@ -2371,38 +2372,38 @@ msgid "Cache has an incompatible versioning system" msgstr "Mellemlageret benytter en inkompatibel versionsstyring" #: apt-pkg/pkgcachegen.cc:117 -#, c-format -msgid "Error occurred while processing %s (NewPackage)" +#, fuzzy, c-format +msgid "Error occured while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format -msgid "Error occurred while processing %s (UsePackage1)" +#, fuzzy, c-format +msgid "Error occured while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format -msgid "Error occurred while processing %s (UsePackage2)" +#, fuzzy, c-format +msgid "Error occured while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format -msgid "Error occurred while processing %s (NewFileVer1)" +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format -msgid "Error occurred while processing %s (NewVersion1)" +#, fuzzy, c-format +msgid "Error occured while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format -msgid "Error occurred while processing %s (UsePackage3)" +#, fuzzy, c-format +msgid "Error occured while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format -msgid "Error occurred while processing %s (NewVersion2)" +#, fuzzy, c-format +msgid "Error occured while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2420,13 +2421,13 @@ msgstr "" "Hold da op! Du nede over det antal afhngigheder, denne APT kan hndtere." #: apt-pkg/pkgcachegen.cc:241 -#, c-format -msgid "Error occurred while processing %s (FindPkg)" +#, fuzzy, c-format +msgid "Error occured while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" +#, fuzzy, c-format +msgid "Error occured while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2452,11 +2453,11 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret" msgid "rename failed, %s (%s -> %s)." msgstr "omdbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2465,7 +2466,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2474,13 +2475,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Strrelsen stemmer ikke" diff --git a/po/de.po b/po/de.po index d95c9b87e..3cb0cc23e 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2004-08-04 15:58 +0200\n" +"PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -304,7 +304,7 @@ msgstr "Kann debconf-Version nicht ermitteln. Ist debconf installiert?" #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 msgid "Package extension list is too long" -msgstr "Paketerweiterungsliste is zu lang" +msgstr "Paketerweiterungsliste ist zu lang" #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 @@ -315,7 +315,7 @@ msgstr "Fehler beim Verarbeiten von Verzeichnis %s" #: ftparchive/apt-ftparchive.cc:250 msgid "Source extension list is too long" -msgstr "Quellerweiterungsliste is zu lang" +msgstr "Quellerweiterungsliste ist zu lang" #: ftparchive/apt-ftparchive.cc:367 msgid "Error writing header to contents file" @@ -376,29 +376,22 @@ msgstr "" " generate config [gruppen]\n" " clean config\n" "\n" -"apt-ftparchive generiert Indexdateien für Debian-Archive. Es unterstützt " -"viele\n" +"apt-ftparchive generiert Indexdateien für Debian-Archive. Es unterstützt viele\n" "verschiedene Arten der Generierung, von vollautomatisch bis hin zu den\n" "funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n" "\n" -"apt-ftparchive generiert Package-Dateien aus einem Baum von .debs. Die " -"Package-\n" -"Datei enthält die Inhalt aller Kontrollfelder aus jedem Paket sowie einen " -"MD5-\n" -"Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte " -"für\n" +"apt-ftparchive generiert Package-Dateien aus einem Baum von .debs. Die Package-\n" +"Datei enthält die Inhalt aller Kontrollfelder aus jedem Paket sowie einen MD5-\n" +"Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte für\n" "Priorität und Sektion zu erzwingen.\n" "\n" -"Auf ganz ähnliche Weise erzeugt apt-ftparchive Sources-Dateien aus einem " -"Baum\n" -"von .dscs. Die Option --source-override kann benutzt werden, um eine " -"Override-\n" +"Auf ganz ähnliche Weise erzeugt apt-ftparchive Sources-Dateien aus einem Baum\n" +"von .dscs. Die Option --source-override kann benutzt werden, um eine Override-\n" "Datei für Quellen anzugeben.\n" "\n" -"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes " -"aufgerufen\n" +"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes aufgerufen\n" "werden. BinaryPath sollte auf die Basis der rekursiven Suche zeigen und\n" -"overridefile sollte die Override-Flags enthalten. Pfadpräfix wird wird, so\n" +"overridefile sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" "vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -1973,7 +1966,7 @@ msgstr "Auswahl %s nicht gefunden" #: apt-pkg/contrib/configuration.cc:395 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nicht erkannte Typabkürzung: ‚%c‘" +msgstr "Nicht erkannte Typabkürzung: »%c«" #: apt-pkg/contrib/configuration.cc:453 #, c-format @@ -2070,7 +2063,7 @@ msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«" #: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" -msgstr "Option ‚%s‘ ist zu lang" +msgstr "Option »%s« ist zu lang" #: apt-pkg/contrib/cmndline.cc:301 #, c-format @@ -2257,27 +2250,27 @@ msgstr "Kann Paketdatei %s nicht parsen (2)" #: apt-pkg/sourcelist.cc:87 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»URI«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" #: apt-pkg/sourcelist.cc:89 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»dist«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" #: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»URI parse«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" #: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»absolute dist«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»dist parse«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2287,22 +2280,22 @@ msgstr "%s wird geöffnet" #: apt-pkg/sourcelist.cc:170 #, c-format msgid "Line %u too long in source list %s." -msgstr "Zeile %u zu lang in der Quelliste %s." +msgstr "Zeile %u zu lang in der Quellliste %s." #: apt-pkg/sourcelist.cc:187 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Missgestaltete Zeile %u in Quelliste %s (»type«)" +msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" #: apt-pkg/sourcelist.cc:191 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ »%s« ist unbekannt in Zeile %u der Quelliste %s" +msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Missgestaltete Zeile %u in Quelliste %s (»vendor id«)" +msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2630,7 +2623,7 @@ msgstr "" "geschrieben.\n" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quelliste %s" +#~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s" #~ msgid "" #~ "Some broken packages were found while trying to process build-" diff --git a/po/fr.po b/po/fr.po index 8644bf55c..d317a2a80 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,4 +1,3 @@ -# translation of fr-save.po to French # translation of fr.po to French # Advanced Package Transfer - APT message translation catalog # French messages @@ -10,7 +9,7 @@ msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-03-29 09:40+0200\n" +"PO-Revision-Date: 2005-05-26 00:44+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -302,7 +301,8 @@ msgstr "Impossible d' #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est install?" +msgstr "" +"Impossible d'obtenir la version de debconf. Est-ce que debconf est install?" #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 msgid "Package extension list is too long" @@ -379,7 +379,7 @@ msgstr "" " clean config\n" "\n" "apt-ftparchive gnre des fichiers d'index pour les archives Debian. Il\n" -"gre de nombreux types de gnration, d'une automatisation complte \n" +"supporte de nombreux types de gnration, d'une automatisation complte \n" "des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n" "\n" "apt-ftparchive gnre les fichiers de paquets partir d'un arbre de .debs.\n" @@ -389,7 +389,7 @@ msgstr "" "des sections\n" "\n" "De faon similaire, apt-ftparchive gnre des fichiers de source partir\n" -"d'un arbre de .dscs. L'option --source-override peut tre utilise pour\n" +"d'un arbre de .dscs. L'option --source-override peut tre employe pour\n" "spcifier un fichier src d'override\n" "\n" "Les commandes packages et sources devraient tre dmarres la\n" @@ -418,7 +418,8 @@ msgstr "Aucune s #: ftparchive/apt-ftparchive.cc:830 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s" +msgstr "" +"Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s" #: ftparchive/cachedb.cc:45 #, c-format @@ -487,7 +488,7 @@ msgstr "Impossible d'ouvrir %s" #: ftparchive/writer.cc:246 #, c-format msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgstr " Dlier %s [%s]\n" #: ftparchive/writer.cc:254 #, c-format @@ -776,7 +777,8 @@ msgstr "Il y a des probl #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." -msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." +msgstr "" +"Les paquets doivent tre enlevs mais la dsinstallation est dsactive." #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 msgid "Unable to lock the download directory" @@ -800,7 +802,8 @@ msgstr "Il est n #: cmdline/apt-get.cc:826 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" +msgstr "" +"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" #: cmdline/apt-get.cc:829 #, c-format @@ -866,7 +869,8 @@ msgstr "" #: cmdline/apt-get.cc:987 msgid "--fix-missing and media swapping is not currently supported" -msgstr "l'option --fix-missing et l'change de support ne sont pas encore reconnus." +msgstr "" +"l'option --fix-missing et l'change de support ne sont pas encore reconnus." #: cmdline/apt-get.cc:992 msgid "Unable to correct missing packages." @@ -928,7 +932,8 @@ msgstr "Aucun paquet ne correspond au paquet %s" #: cmdline/apt-get.cc:1129 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" +msgstr "" +"La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" #: cmdline/apt-get.cc:1137 #, c-format @@ -982,7 +987,8 @@ msgstr "Note, s #: cmdline/apt-get.cc:1515 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes:" +msgstr "" +"Vous pouvez lancer apt-get -f install pour corriger ces problmes:" #: cmdline/apt-get.cc:1518 msgid "" @@ -1146,7 +1152,8 @@ msgstr "Impossible de satisfaire les d #: cmdline/apt-get.cc:2282 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." +msgstr "" +"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." #: cmdline/apt-get.cc:2286 msgid "Failed to process build dependencies" @@ -1329,7 +1336,8 @@ msgstr "" "seules les erreurs" #: dselect/install:103 -msgid "above this message are important. Please fix them and run [I]nstall again" +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" "prcdant ce message sont importantes. Veuillez les corriger et\n" "dmarrer l'[I]nstallation une nouvelle fois." @@ -1560,7 +1568,7 @@ msgid "Internal error adding a diversion" msgstr "Erreur interne en ajoutant une dviation" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialized first" +msgid "The pkg cache must be initialize first" msgstr "Le cache des paquets doit tre initialis en premier" #: apt-inst/deb/dpkgdb.cc:386 @@ -1590,7 +1598,8 @@ msgstr "Ce n'est pas une archive DEB valide, partie #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s " +msgstr "" +"Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s " #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1688,7 +1697,8 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "La commande %s du script de connexion a chou, le serveur a rpondu: %s" +msgstr "" +"La commande %s du script de connexion a chou, le serveur a rpondu: %s" #: methods/ftp.cc:291 #, c-format @@ -1725,7 +1735,8 @@ msgstr "Impossible de cr #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Impossible de se connecter sur le port de donnes, dlai de connexion dpass" +msgstr "" +"Impossible de se connecter sur le port de donnes, dlai de connexion dpass" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -2136,7 +2147,7 @@ msgstr "lu(s), %lu restant #: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "crit(s), %lu restant crire, mais l'ecriture est impossible" +msgstr "crit(s), %lu restant crire, mais l'criture est impossible" #: apt-pkg/contrib/fileutl.cc:579 msgid "Problem closing the file" @@ -2259,12 +2270,14 @@ msgstr "Ligne %lu mal form #: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Ligne %lu mal forme dans la liste des sources %s (distribution absolue)" +msgstr "" +"Ligne %lu mal forme dans la liste des sources %s (distribution absolue)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)" +msgstr "" +"Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2284,12 +2297,14 @@ msgstr "Ligne %u mal form #: apt-pkg/sourcelist.cc:191 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Le type %s est inconnu sur la ligne %u dans la liste des sources %s" +msgstr "" +"Le type %s est inconnu sur la ligne %u dans la liste des sources %s" #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)" +msgstr "" +"Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2310,7 +2325,8 @@ msgstr "Le type de fichier d'index #: apt-pkg/algorithms.cc:241 #, c-format -msgid "The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Le paquet %s doit tre rinstall, mais je ne parviens pas trouver son " "archive." @@ -2365,7 +2381,8 @@ msgstr "Impossible de localiser %s." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Vous devez insrer quelques adresses sources dans votre sources.list" +msgstr "" +"Vous devez insrer quelques adresses sources dans votre sources.list" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." @@ -2398,65 +2415,64 @@ msgstr "Le cache poss #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occurred while processing %s (NewPackage)" +msgid "Error occured while processing %s (NewPackage)" msgstr "Erreur apparue lors du traitement de %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occurred while processing %s (UsePackage1)" +msgid "Error occured while processing %s (UsePackage1)" msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occurred while processing %s (UsePackage2)" +msgid "Error occured while processing %s (UsePackage2)" msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occurred while processing %s (NewFileVer1)" +msgid "Error occured while processing %s (NewFileVer1)" msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occurred while processing %s (NewVersion1)" +msgid "Error occured while processing %s (NewVersion1)" msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occurred while processing %s (UsePackage3)" +msgid "Error occured while processing %s (UsePackage3)" msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occurred while processing %s (NewVersion2)" +msgid "Error occured while processing %s (NewVersion2)" msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Oula, vous avez dpass le nombre de noms de paquets que cet APT est capable " -"de traiter." +"Vous avez dpass le nombre de noms de paquets que cet APT est capable de " +"traiter." #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -"Oula, vous avez dpass le nombre de versions que cet APT est capable de " -"traiter." +"Vous avez dpass le nombre de versions que cet APT est capable de traiter." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Oula, vous avez dpass le nombre de dpendances que cet APT est capable de " +"Vous avez dpass le nombre de dpendances que cet APT est capable de " "traiter." #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occurred while processing %s (FindPkg)" +msgid "Error occured while processing %s (FindPkg)" msgstr "Erreur apparue lors du traitement de %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" +msgid "Error occured while processing %s (CollectFileProvides)" msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2477,18 +2493,19 @@ msgstr "Assemblage des fichiers list #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "" +"Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Somme de contrle MD5 incohrente" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2498,7 +2515,7 @@ msgstr "" "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2507,14 +2524,15 @@ msgstr "" "Je ne suis pas parvenu localiser un fichier du paquet %s. Ceci signifie " "que vous devrez corriger manuellement ce paquet." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ Filename: " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Taille incohrente" @@ -2619,8 +2637,237 @@ msgstr "" "%i enregistrements crits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" +#~ msgid "Total Package Names : " +#~ msgstr "Nombre total de paquets: " + +#~ msgid " Normal Packages: " +#~ msgstr " Paquets ordinaires: " + +#~ msgid " Pure Virtual Packages: " +#~ msgstr " Paquets entirement virtuels: " + +#~ msgid " Single Virtual Packages: " +#~ msgstr " Paquets virtuels simples: " + +#~ msgid " Mixed Virtual Packages: " +#~ msgstr " Paquets virtuels mixtes: " + +#~ msgid "Total Distinct Versions: " +#~ msgstr "Nombre de versions distinctes: " + +#~ msgid "Total Dependencies: " +#~ msgstr "Nombre de dpendances: " + +#~ msgid "Total Ver/File relations: " +#~ msgstr "Nombre de relations version/fichier: " + +#~ msgid "Total Provides Mappings: " +#~ msgstr "Nombre de relations Provides: " + +#~ msgid "Total Globbed Strings: " +#~ msgstr "Nombre de motifs rationnels: " + +#~ msgid "Total Dependency Version space: " +#~ msgstr "Espace occup par les versions des dpendances: " + +#~ msgid "Total Slack space: " +#~ msgstr "Espace disque gaspill: " + +#~ msgid "Total Space Accounted for: " +#~ msgstr "Total de l'espace attribu: " + +#~ msgid "Package Files:" +#~ msgstr "Fichiers du paquet:" + +#~ msgid "Pinned Packages:" +#~ msgstr "Paquets tiquets:" + +#~ msgid " Package Pin: " +#~ msgstr " tiquette de paquet: " + +#~ msgid " Version Table:" +#~ msgstr " Table de version:" + +#~ msgid "Error Processing directory %s" +#~ msgstr "Erreur lors du traitement du rpertoire %s" + +#~ msgid "Error Processing Contents %s" +#~ msgstr "Erreur du traitement du contenu %s" + +#~ msgid "Unknown Compresison Algorithm '%s'" +#~ msgstr "Algorithme de compression %s inconnu" + +#~ msgid "Compress Child" +#~ msgstr "Fils compress" + +#~ msgid "Internal Error, Failed to create %s" +#~ msgstr "Erreur interne, impossible de crer %s" + +#~ msgid "Packages need to be removed but Remove is disabled." +#~ msgstr "" +#~ "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." + +#~ msgid "Do you want to continue? [Y/n] " +#~ msgstr "Souhaitez-vous continuer? [O/n] " + +#~ msgid "Aborting Install." +#~ msgstr "Annulation de l'installation." + +#~ msgid "Internal Error, AllUpgrade broke stuff" +#~ msgstr "Erreur interne, AllUpgrade a cass le boulot!" + +#~ msgid "Calculating Upgrade... " +#~ msgstr "Calcul de la mise jour... " + +#~ msgid "Fetch Source %s\n" +#~ msgstr "Rcupration des sources %s\n" + +#~ msgid "Supported Modules:" +#~ msgstr "Modules reconnus:" + +#~ msgid "" +#~ "Media Change: Please insert the disc labeled\n" +#~ " '%s'\n" +#~ "in the drive '%s' and press enter\n" +#~ msgstr "" +#~ "Changement de support: veuillez insrer le disque\n" +#~ "%s\n" +#~ "dans le lecteur %s et appuyez sur la touche Entre\n" + +#~ msgid "Merging Available information" +#~ msgstr "Fusion des informations disponibles" + +#~ msgid "Tar Checksum failed, archive corrupted" +#~ msgstr "chec dans la somme de contrle de tar, l'archive est corrompue" + +#~ msgid "Internal Error in AddDiversion" +#~ msgstr "Erreur interne dans AddDiversion" + +#~ msgid "Reading Package Lists" +#~ msgstr "Lecture des listes de paquets" + +#~ msgid "Internal Error getting a Package Name" +#~ msgstr "Erreur interne lors de l'obtention d'un nom de paquet" + +#~ msgid "Reading File Listing" +#~ msgstr "Lecture de la liste de fichiers" + +#~ msgid "Internal Error getting a Node" +#~ msgstr "Erreur interne lors de l'obtention d'un Nud" + +#~ msgid "Internal Error adding a diversion" +#~ msgstr "Erreur interne en ajoutant une dviation" + +#~ msgid "Reading File List" +#~ msgstr "Lecture de la liste des fichiers" + +#~ msgid "Failed to find a Package: Header, offset %lu" +#~ msgstr "Impossible de trouver un en-tte Package:, dcalage %lu" + +#~ msgid "Internal Error, could not locate member %s" +#~ msgstr "Erreur interne, ne peut localiser la partie %s" + +#~ msgid "Internal Error, could not locate member" +#~ msgstr "Erreur interne, ne peut localiser le membre" + +#~ msgid "Unparsible control file" +#~ msgstr "Fichier de contrle non traitable" + +#~ msgid "" +#~ "Please use apt-cdrom to make this CD recognized by APT. apt-get update " +#~ "cannot be used to add new CDs" +#~ msgstr "" +#~ "Veuillez utiliser apt-cdrom afin de faire reconnatre ce cdrom par " +#~ "votre APT. apt-get update ne peut tre employ pour ajouter de nouveaux " +#~ "cdroms" + +#~ msgid "Wrong CD" +#~ msgstr "Mauvais cdrom" + +#~ msgid "Server refused our connection and said: %s" +#~ msgstr "Le serveur a refus notre connexion et a rpondu: %s" + +#~ msgid "Write Error" +#~ msgstr "Erreur d'criture" + +#~ msgid "The http server sent an invalid reply header" +#~ msgstr "Le serveur http a envoy une rponse dont l'en-tte est invalide" + +#~ msgid "The http server sent an invalid Content-Length header" +#~ msgstr "Le serveur http a envoy un en-tte Content-Length invalide" + +#~ msgid "The http server sent an invalid Content-Range header" +#~ msgstr "Le serveur http a envoy un en-tte Content-Range invalide" + +#~ msgid "This http server has broken range support" +#~ msgstr "Ce serveur http possde un support des limites non-valide" + +#~ msgid "Error reading from server Remote end closed connection" +#~ msgstr "" +#~ "Erreur de lecture depuis le serveur distant et clture de la connexion" + +#~ msgid "Bad header Data" +#~ msgstr "Mauvais en-tte de donne" + +#~ msgid "Syntax error %s:%u: Malformed Tag" +#~ msgstr "Erreur syntaxique %s:%u: balise mal forme" + +#~ msgid "Waited, for %s but it wasn't there" +#~ msgstr "A attendu %s mais il n'tait pas prsent" + +#~ msgid "This APT does not support the Versioning System '%s'" +#~ msgstr "Cet APT ne supporte pas le systme de version %s" + +#~ msgid "Building Dependency Tree" +#~ msgstr "Construction de l'arbre des dpendances" + +#~ msgid "Candidate Versions" +#~ msgstr "Versions possibles" + +#~ msgid "Dependency Generation" +#~ msgstr "Gnration des dpendances" + +#~ msgid "Malformed line %lu in source list %s (Absolute dist)" +#~ msgstr "" +#~ "Ligne %lu mal forme dans la liste des sources %s (distribution absolue)" + +#~ msgid "Vendor block %s is invalid" +#~ msgstr "Bloc de fournisseur %s invalide" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "Identifiant %s du fournisseur inconnu dans la ligne %u de la liste " #~ "des sources %s" +#~ msgid "File Not Found" +#~ msgstr "Fichier non trouv" + +#~ msgid "The pkg cache must be initialized first" +#~ msgstr "Le cache des paquets doit tre initialis en premier" + +#~ msgid "Error occurred while processing %s (NewPackage)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewPackage)" + +#~ msgid "Error occurred while processing %s (UsePackage1)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" + +#~ msgid "Error occurred while processing %s (UsePackage2)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" + +#~ msgid "Error occurred while processing %s (NewFileVer1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#~ msgid "Error occurred while processing %s (NewVersion1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" + +#~ msgid "Error occurred while processing %s (UsePackage3)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" + +#~ msgid "Error occurred while processing %s (NewVersion2)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" + +#~ msgid "Error occurred while processing %s (FindPkg)" +#~ msgstr "Erreur apparue lors du traitement de %s (FindPkg)" + +#~ msgid "Error occurred while processing %s (CollectFileProvides)" +#~ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" diff --git a/po/he.po b/po/he.po index 242155eff..189370945 100644 --- a/po/he.po +++ b/po/he.po @@ -639,8 +639,7 @@ msgstr "לא מצליח לתקן תלויות" #: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" msgstr "" -"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" -"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" +"א ז ה ר ה: החבילות החיוניות הבאות יוסרו" #: cmdline/apt-get.cc:658 msgid " Done" diff --git a/po/pt.po b/po/pt.po index 21912759b..4b1568efe 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2602,54 +2602,35 @@ msgstr "" "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" -#: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialized first" -msgstr "A cache de pacotes tem de ser inicializada primeiro" +#~ msgid "The pkg cache must be initialized first" +#~ msgstr "A cache de pacotes tem de ser inicializada primeiro" -#: apt-pkg/pkgcachegen.cc:117 -#, c-format -msgid "Error occurred while processing %s (NewPackage)" -msgstr "Um erro ocorreu ao processar %s (NovoPacote)" +#~ msgid "Error occurred while processing %s (NewPackage)" +#~ msgstr "Um erro ocorreu ao processar %s (NovoPacote)" -#: apt-pkg/pkgcachegen.cc:129 -#, c-format -msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Um erro ocorreu ao processar %s (UsePacote1)" +#~ msgid "Error occurred while processing %s (UsePackage1)" +#~ msgstr "Um erro ocorreu ao processar %s (UsePacote1)" -#: apt-pkg/pkgcachegen.cc:150 -#, c-format -msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Um erro ocorreu ao processar %s (UsePacote2)" +#~ msgid "Error occurred while processing %s (UsePackage2)" +#~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)" -#: apt-pkg/pkgcachegen.cc:154 -#, c-format -msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" +#~ msgid "Error occurred while processing %s (NewFileVer1)" +#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" -#: apt-pkg/pkgcachegen.cc:184 -#, c-format -msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" +#~ msgid "Error occurred while processing %s (NewVersion1)" +#~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" -#: apt-pkg/pkgcachegen.cc:188 -#, c-format -msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Um erro ocorreu ao processar %s (UsePacote3)" +#~ msgid "Error occurred while processing %s (UsePackage3)" +#~ msgstr "Um erro ocorreu ao processar %s (UsePacote3)" -#: apt-pkg/pkgcachegen.cc:192 -#, c-format -msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" +#~ msgid "Error occurred while processing %s (NewVersion2)" +#~ msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" -#: apt-pkg/pkgcachegen.cc:241 -#, c-format -msgid "Error occurred while processing %s (FindPkg)" -msgstr "Um erro ocorreu ao processar %s (FindPkg)" +#~ msgid "Error occurred while processing %s (FindPkg)" +#~ msgstr "Um erro ocorreu ao processar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 -#, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" +#~ msgid "Error occurred while processing %s (CollectFileProvides)" +#~ msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8e1525db7..82271928b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,13 +6,13 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-13 15:18-0200\n" +"Report-Msgid-Bugs-To: debian-l10n-portuguese@lists.debian.org\n" +"POT-Creation-Date: 2005-05-23 11:34+0200\n" +"PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: Andr Lus Lopes \n" "Language-Team: Debian-BR Project \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" #: cmdline/apt-cache.cc:135 @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -325,7 +325,6 @@ msgid "Error processing contents %s" msgstr "Erro processando Contedo %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -378,7 +377,7 @@ msgstr "" "suporta muitos estilos de gerao, desde totalmente automatizadas at \n" "substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n" "\n" -"O apt-ftparchive gera arquivos Packages a partir de uma rvore de .debs.\n" +"O apt-ftparchive gera arquivos Package a partir de uma rvore de .debs.\n" " O arquivo Package contm o contedo de todos os campos control de \n" "cada pacote bem como o hash MD5 e tamanho de arquivo. Um arquivo \n" "override suportado para forar o valor de Priority e Section.\n" @@ -623,7 +622,7 @@ msgstr "Falha ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilao de regex - %s" @@ -772,11 +771,11 @@ msgstr "H msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam ser removidos mas a remoo est desabilitada." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Impossvel criar lock no diretrio de download" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes no pde ser lida." @@ -834,7 +833,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n] ? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao baixar %s %s\n" @@ -843,7 +842,7 @@ msgstr "Falha ao baixar %s %s\n" msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" @@ -946,7 +945,7 @@ msgstr "Vers msgid "The update command takes no arguments" msgstr "O comando update no leva argumentos" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Impossvel criar lock no diretrio de listas" @@ -962,21 +961,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade quebrou as coisas" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Impossvel achar pacote %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expresso regular '%s'\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Voc deve querer rodar `apt-get -f install' para corrigir isso:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -984,7 +983,7 @@ msgstr "" "Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma soluo)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -996,7 +995,7 @@ msgstr "" "distribuio instvel, que alguns pacotes requeridos no foram \n" "criados ainda ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1006,107 +1005,107 @@ msgstr "" "esteja simplesmente no instalvel e um relato de erro sobre esse\n" "pacotes deve ser enviado." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "A informao a seguir pode ajudar a resolver a situao:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir sero instalados:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calculando Atualizao... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossvel encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Voc no possui espao livre suficiente em %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Obter Fonte %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Falha ao fazer o download de alguns arquivos." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando desempacotamento de pacote fonte j desempacotado em %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construo '%s' falhou.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependncias " "de construo" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossvel conseguir informaes de dependncia de construo para %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tem dependncias de construo.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1115,7 +1114,7 @@ msgstr "" "a dependncia de %s por %s no pde ser satisfeita porque o pacote %s no " "pde ser encontrado" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1124,32 +1123,32 @@ msgstr "" "a dependncia de %s por %s no pode ser satisfeita porque nenhuma verso " "disponvel do pacote %s pode satisfazer os requerimentos de verso" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependncia %s para %s: Pacote instalado %s muito " "novo" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependncia %s para %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No foi possvel satisfazer as dependncias de compilao para %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependncias de construo" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Mdulos Suportados:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1549,7 +1548,7 @@ msgid "Internal error adding a diversion" msgstr "Erro Interno ao adicionar um desvio" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialized first" +msgid "The pkg cache must be initialize first" msgstr "O cache de pacotes deve ser inicializado primeiro" #: apt-inst/deb/dpkgdb.cc:386 @@ -1758,7 +1757,7 @@ msgstr "Conex msgid "Unable to accept connection" msgstr "Impossvel aceitar conexo" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@ -1885,43 +1884,43 @@ msgstr "Este servidor http possui suporte a range quebrado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Seleo falhou." -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Conexo expirou" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de sada" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor Ponto remoto fechou a conexo" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Dados de cabealho ruins" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Conexo falhou." -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Erro interno" @@ -2384,37 +2383,37 @@ msgstr "O Cache possui um sistema de vers #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occurred while processing %s (NewPackage)" +msgid "Error occured while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occurred while processing %s (UsePackage1)" +msgid "Error occured while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occurred while processing %s (UsePackage2)" +msgid "Error occured while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occurred while processing %s (NewFileVer1)" +msgid "Error occured while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occurred while processing %s (NewVersion1)" +msgid "Error occured while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVerso1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occurred while processing %s (UsePackage3)" +msgid "Error occured while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occurred while processing %s (NewVersion2)" +msgid "Error occured while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVerso2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2435,12 +2434,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occurred while processing %s (FindPkg)" +msgid "Error occured while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" +msgid "Error occured while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu processando %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2466,11 +2465,11 @@ msgstr "Erro de I/O ao gravar cache fonte" msgid "rename failed, %s (%s -> %s)." msgstr "renomeao falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2480,7 +2479,7 @@ msgstr "" "que voc precisa consertar manualmente este pacote. (devido a arquitetura " "no especificada)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2489,7 +2488,7 @@ msgstr "" "No foi possvel localizar arquivo para o pacote %s. Isto pode significar " "que voc precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2497,7 +2496,7 @@ msgstr "" "Os arquivos de ndice de pacotes esto corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Tamanho incorreto" diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg deleted file mode 100644 index c391d8fa1..000000000 Binary files a/share/debian-archive.gpg and /dev/null differ -- cgit v1.2.3 From 29ba053e05b1a496500036dbd667002d1b8b5ec2 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sun, 26 Jun 2005 21:30:27 +0000 Subject: Merge with mvo Patches applied: * michael.vogt@ubuntu.com--2005/apt--bts225947--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-1 * merged with mainline and apt--fixes--0 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-2 * patch from aj (slighly modified to use auto_ptr<>) applied * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-3 * changelog updated * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-4 * work for arch=all packages too now * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-5 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-7 * fixed incorrect man-page example * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-8 * changelog udpate * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-87 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-1 * report timeouts (from Connect) and fail if they happen in pkgAcqMetaSig * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-2 * merged with the fixes branch to make it build again * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-1 tag of apt@packages.debian.org/apt--main--0--patch-88 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-2 * merged apt--mvo (to make pining on components work again) * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-3 * merged with apt--fixes--0 (to make the building of the french manpages work and to fix a incorrect man-page example * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-4 * merged with the bts225947 code * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-5 * merged the imporoved timoeut handling patch * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-6 * merged with matt * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-7 * removed another conflict with apt--main --- apt-pkg/acquire-item.cc | 6 +++++ debian/changelog | 8 +++++++ doc/apt_preferences.5.xml | 2 +- ftparchive/apt-ftparchive.cc | 7 +++++- ftparchive/override.cc | 38 ++++++++++++++++++++++++++++++ ftparchive/override.h | 9 ++++---- ftparchive/writer.cc | 55 ++++++++++++++++++++++++++------------------ ftparchive/writer.h | 7 ++++-- methods/connect.cc | 4 +++- 9 files changed, 104 insertions(+), 32 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index b2f896627..14acad85a 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -400,6 +400,12 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); unlink(Final.c_str()); + // if we get a timeout if fail + if(LookupTag(Message,"FailReason") == "Timeout") { + Item::Failed(Message,Cnf); + return; + } + // queue a pkgAcqMetaIndex with no sigfile new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc, "", IndexTargets, MetaIndexParser); diff --git a/debian/changelog b/debian/changelog index 2ff5dd8c3..fd5959423 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,14 @@ apt (0.6.39) unstable; urgency=low * Merge aggregated translation updates: bubulle@debian.org--2005/apt--main--0 * Update priority of apt-utils to important, to match the override file + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line -- diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 3e50bef8c..12b03196a 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -183,7 +183,7 @@ belonging to any distribution whose Archive name is "unstable Package: * Pin: release a=unstable -Pin-Priority: 50 +Pin-Priority: 500 The following record assigns a high priority to all package versions diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 31ff8d600..0e2be8a00 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -56,6 +56,9 @@ struct PackageMap string BinCacheDB; string BinOverride; string ExtraOverride; + + // We generate for this given arch + string Arch; // Stuff for the Source File string SrcFile; @@ -158,7 +161,8 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats) // Create a package writer object. PackagesWriter Packages(flCombine(CacheDir,BinCacheDB), flCombine(OverrideDir,BinOverride), - flCombine(OverrideDir,ExtraOverride)); + flCombine(OverrideDir,ExtraOverride), + Arch); if (PkgExt.empty() == false && Packages.SetExts(PkgExt) == false) return _error->Error(_("Package extension list is too long")); if (_error->PendingError() == true) @@ -489,6 +493,7 @@ void LoadTree(vector &PkgList,Configuration &Setup) Itm.BaseDir = SubstVar(Block.Find("Directory",DDir.c_str()),Vars); Itm.PkgFile = SubstVar(Block.Find("Packages",DPkg.c_str()),Vars); Itm.Tag = SubstVar("$(DIST)/$(SECTION)/$(ARCH)",Vars); + Itm.Arch = Arch; Itm.Contents = SubstVar(Block.Find("Contents",DContents.c_str()),Vars); Itm.ContentsHead = SubstVar(Block.Find("Contents::Header",DContentsH.c_str()),Vars); Itm.FLFile = SubstVar(Block.Find("FileList",DFLFile.c_str()),Vars); diff --git a/ftparchive/override.cc b/ftparchive/override.cc index 669ce25bf..b8b94843f 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -207,6 +207,44 @@ bool Override::ReadExtraOverride(string File,bool Source) return true; } /*}}}*/ + +// Override::GetItem - Get a architecture specific item /*{{{*/ +// --------------------------------------------------------------------- +/* Returns a override item for the given package and the given architecture. + * Treats "all" special + */ +Override::Item* Override::GetItem(string Package, string Architecture) +{ + map::iterator I = Mapping.find(Package); + map::iterator J = Mapping.find(Package + "/" + Architecture); + + if (I == Mapping.end() && J == Mapping.end()) + { + return 0; + } + + Item *result = new Item; + if (I == Mapping.end()) *result = J->second; + else + { + *result = I->second; + if (J != Mapping.end()) + { + Item *R = &J->second; + if (R->Priority != "") result->Priority = R->Priority; + if (R->OldMaint != "") result->OldMaint = R->OldMaint; + if (R->NewMaint != "") result->NewMaint = R->NewMaint; + for (map::iterator foI = R->FieldOverride.begin(); + foI != R->FieldOverride.end(); foI++) + { + result->FieldOverride[foI->first] = foI->second; + } + } + } + return result; +}; + + // Override::Item::SwapMaint - Swap the maintainer field if necessary /*{{{*/ // --------------------------------------------------------------------- /* Returns the new maintainer string after evaluating the rewriting rule. If diff --git a/ftparchive/override.h b/ftparchive/override.h index 2d6a4e27c..e64641776 100644 --- a/ftparchive/override.h +++ b/ftparchive/override.h @@ -34,17 +34,16 @@ class Override map FieldOverride; string SwapMaint(string Orig,bool &Failed); + ~Item() {}; }; map Mapping; inline Item *GetItem(string Package) { - map::iterator I = Mapping.find(Package); - if (I == Mapping.end()) - return 0; - return &I->second; - }; + return GetItem(Package, ""); + } + Item *GetItem(string Package, string Architecture); bool ReadOverride(string File,bool Source = false); bool ReadExtraOverride(string File,bool Source = false); diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 35a23a3d7..0b68d0bbf 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -36,7 +36,6 @@ #include "apt-ftparchive.h" #include "multicompress.h" /*}}}*/ - using namespace std; FTWScanner *FTWScanner::Owner; @@ -285,8 +284,9 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, // PackagesWriter::PackagesWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides) : - Db(DB),Stats(Db.Stats) +PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides, + string aArch) : + Db(DB),Stats(Db.Stats), Arch(aArch) { Output = stdout; SetExts(".deb .udeb .foo .bar .baz"); @@ -371,14 +371,22 @@ bool PackagesWriter::DoPackage(string FileName) // Lookup the overide information pkgTagSection &Tags = Db.Control.Section; string Package = Tags.FindS("Package"); - Override::Item Tmp; - Override::Item *OverItem = Over.GetItem(Package); + string Architecture; + // if we generate a Packages file for a given arch, we use it to + // look for overrides. if we run in "simple" mode without the + // "Architecures" variable in the config we use the architecure value + // from the deb file + if(Arch != "") + Architecture = Arch; + else + Architecture = Tags.FindS("Architecture"); + auto_ptr OverItem(Over.GetItem(Package,Architecture)); if (Package.empty() == true) return _error->Error(_("Archive had no package field")); - + // If we need to do any rewriting of the header do it now.. - if (OverItem == 0) + if (OverItem.get() == 0) { if (NoOverride == false) { @@ -386,9 +394,9 @@ bool PackagesWriter::DoPackage(string FileName) ioprintf(c1out, _(" %s has no override entry\n"), Package.c_str()); } - OverItem = &Tmp; - Tmp.FieldOverride["Section"] = Tags.FindS("Section"); - Tmp.Priority = Tags.FindS("Priority"); + OverItem = auto_ptr(new Override::Item); + OverItem->FieldOverride["Section"] = Tags.FindS("Section"); + OverItem->Priority = Tags.FindS("Priority"); } char Size[40]; @@ -557,7 +565,7 @@ bool SourcesWriter::DoPackage(string FileName) string BestPrio; string Bins = Tags.FindS("Binary"); char Buffer[Bins.length() + 1]; - Override::Item *OverItem = 0; + auto_ptr OverItem(0); if (Bins.empty() == false) { strcpy(Buffer,Bins.c_str()); @@ -570,10 +578,10 @@ bool SourcesWriter::DoPackage(string FileName) unsigned char BestPrioV = pkgCache::State::Extra; for (unsigned I = 0; BinList[I] != 0; I++) { - Override::Item *Itm = BOver.GetItem(BinList[I]); - if (Itm == 0) + auto_ptr Itm(BOver.GetItem(BinList[I])); + if (Itm.get() == 0) continue; - if (OverItem == 0) + if (OverItem.get() == 0) OverItem = Itm; unsigned char NewPrioV = debListParser::GetPrio(Itm->Priority); @@ -586,8 +594,7 @@ bool SourcesWriter::DoPackage(string FileName) } // If we need to do any rewriting of the header do it now.. - Override::Item Tmp; - if (OverItem == 0) + if (OverItem.get() == 0) { if (NoOverride == false) { @@ -595,15 +602,19 @@ bool SourcesWriter::DoPackage(string FileName) ioprintf(c1out, _(" %s has no override entry\n"), Tags.FindS("Source").c_str()); } - OverItem = &Tmp; + OverItem = auto_ptr(new Override::Item); } - Override::Item *SOverItem = SOver.GetItem(Tags.FindS("Source")); - if (SOverItem == 0) + auto_ptr SOverItem(SOver.GetItem(Tags.FindS("Source"))); + const auto_ptr autoSOverItem(SOverItem); + if (SOverItem.get() == 0) { - SOverItem = BOver.GetItem(Tags.FindS("Source")); - if (SOverItem == 0) - SOverItem = OverItem; + SOverItem = auto_ptr(BOver.GetItem(Tags.FindS("Source"))); + if (SOverItem.get() == 0) + { + SOverItem = auto_ptr(new Override::Item); + *SOverItem = *OverItem; + } } // Add the dsc to the files hash list diff --git a/ftparchive/writer.h b/ftparchive/writer.h index ce4c947a9..16d014ef8 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -92,13 +92,15 @@ class PackagesWriter : public FTWScanner string DirStrip; FILE *Output; struct CacheDB::Stats &Stats; - + string Arch; + inline bool ReadOverride(string File) {return Over.ReadOverride(File);}; inline bool ReadExtraOverride(string File) {return Over.ReadExtraOverride(File);}; virtual bool DoPackage(string FileName); - PackagesWriter(string DB,string Overrides,string ExtOverrides=string()); + PackagesWriter(string DB,string Overrides,string ExtOverrides=string(), + string Arch=string()); virtual ~PackagesWriter() {}; }; @@ -170,6 +172,7 @@ protected: string SHA1; // Limited by FileFd::Size() unsigned long size; + ~CheckSum() {}; }; map CheckSums; }; diff --git a/methods/connect.cc b/methods/connect.cc index 981ac1371..b85df6887 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -88,9 +88,11 @@ static bool DoConnect(struct addrinfo *Addr,string Host, /* This implements a timeout for connect by opening the connection nonblocking */ - if (WaitFd(Fd,true,TimeOut) == false) + if (WaitFd(Fd,true,TimeOut) == false) { + Owner->SetFailExtraMsg("\nFailReason: Timeout"); return _error->Error(_("Could not connect to %s:%s (%s), " "connection timed out"),Host.c_str(),Service,Name); + } // Check the socket for an error condition unsigned int Err; -- cgit v1.2.3