Browse Source

* merged 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-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

 * apt@packages.debian.org/apt--main--0--patch-93
   Merge with mvo

 * 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

 * 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 <virtual-pkg> 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)
debian/1.8.y
Michael Vogt 17 years ago
parent
commit
e004867d09
  1. 11
      apt-pkg/algorithms.cc
  2. 4
      apt-pkg/deb/debindexfile.cc
  3. 11
      apt-pkg/deb/deblistparser.cc
  4. 3
      apt-pkg/deb/deblistparser.h
  5. 3
      apt-pkg/depcache.cc
  6. 6
      cmdline/apt-key
  7. 2
      configure.in
  8. 2
      debian/apt.postinst
  9. 26
      debian/changelog
  10. 4
      debian/control
  11. 2
      debian/rules
  12. 111
      po/da.po
  13. 53
      po/de.po
  14. 339
      po/fr.po
  15. 3
      po/he.po
  16. 59
      po/pt.po
  17. 149
      po/pt_BR.po
  18. BIN
      share/debian-archive.gpg

11
apt-pkg/algorithms.cc

@ -1330,11 +1330,12 @@ void pkgMarkPkgUsed(pkgDepCache &Cache, pkgCache::PkgIterator Pkg,
bool pkgMarkUsed(pkgDepCache &Cache)
{
// debug only
for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); ! Pkg.end(); ++Pkg)
if(!Cache[Pkg].Dirty() && Cache[Pkg].AutomaticRemove > 0)
std::cout << "has auto-remove information: " << Pkg.Name()
<< " " << (int)Cache[Pkg].AutomaticRemove
<< std::endl;
if(_config->FindI("Debug::pkgAutoRemove",false) == true)
for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); ! Pkg.end(); ++Pkg)
if(!Cache[Pkg].Dirty() && Cache[Pkg].AutomaticRemove > 0)
std::cout << "has auto-remove information: " << Pkg.Name()
<< " " << (int)Cache[Pkg].AutomaticRemove
<< std::endl;
// init with defaults
for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); ! Pkg.end(); ++Pkg)

4
apt-pkg/deb/debindexfile.cc

@ -24,7 +24,7 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/debmetaindex.h>
#include <sys/stat.h>
/*}}}*/
@ -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;

11
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();
}
/*}}}*/

3
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,

3
apt-pkg/depcache.cc

@ -98,6 +98,9 @@ bool pkgDepCache::Init(OpProgress *Prog)
}
Update(Prog);
if(Prog != 0)
Prog->Done();
return true;
}

6
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

2
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)

2
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
;;

26
debian/changelog

@ -1,3 +1,29 @@
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.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 <mdz@debian.org> 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

4
debian/control

@ -2,7 +2,7 @@ Source: apt
Section: admin
Priority: important
Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>
Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
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)
@ -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

2
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

111
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 <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\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 opsætningen\n"
"\n"
"Options:\n"
"Tilvalg:\n"
" -h Denne hjælpetekst.\n"
" -c=? Læs denne opsætningsfil\n"
" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
@ -287,7 +287,7 @@ msgstr ""
"apt-extracttemplates er et værktøj til at uddrage opsætnings- og skabelon-"
"oplysninger fra Debianpakker\n"
"\n"
"Options:\n"
"Tilvalg:\n"
" -h Denne hjælpetekst\n"
" -t Angiv temp-mappe\n"
" -c=? Læs denne opsætningsfil\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 hjælpetekst\n"
" --md5 Styr generering af MD5\n"
" -s=? Kilde-tvangsfil\n"
" -q Stille (vis færre statusbeskeder)\n"
" -q Stille\n"
" -d=? Vælg den valgfrie mellemlager-database\n"
" --no-delink Aktivér \"delinking\" fejlsporingstilstand\n"
" --contents Bestem generering af inholdsfil\n"
" --no-delink Aktivér \"delinking\"-fejlsporingstilstand\n"
" --contents Bestem generering af indholdsfil\n"
" -c=? Læs denne opsætningsfil\n"
" -o=? Sæt en opsætnings-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 "Følgende pakker vil blive FJERNET:"
msgstr "Følgende 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: Følgende essentielle pakker vil blive fjernet\n"
"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
"Dette bør 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 fuldstændigt installerede eller fjernede.\n"
msgstr "%lu ikke fuldstændigt 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 - Udfør en opgradering\n"
" install - Installér nye pakker (pakke er libc6, ikke libc6.deb)\n"
" remove - Fjern pakker\n"
" remove - Afinstallér pakker\n"
" source - Hent kildetekstarkiver\n"
" build-dep - Sæt opbygningsafhængigheder op for kildetekstpakker\n"
" dist-upgrade - Distributionsopgradering, se apt-get(8)\n"
" dselect-upgrade - Følg 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 afhængigheder\n"
"\n"
"Tilvalg:\n"
@ -1283,7 +1282,7 @@ msgstr ""
"apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -s\n"
"bruges til at angive filens type.\n"
"\n"
"Options:\n"
"Tilvalg:\n"
" -h Denne hjælpetekst\n"
" -s Benyt kildefils-sortering\n"
" -c=? Læs denne opsætningsfil\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 tilføjelse 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 først"
#: 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 ""
"Kørsel af denne installation kræver midlertidig fjernelse af den essentielle "
"pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig idé, men hvis "
"du virkelig vil gøre det, kan du aktivere valget 'APT::Force-LoopBreak'."
"Kørsel af denne installation kræver midlertidig afinstallation af den "
"essentielle pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig "
"idé, men hvis du virkelig vil gøre 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 nåede over det antal afhængigheder, denne APT kan håndtere."
#: 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 "omdøbning 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 "
"nødt 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 "
"nødt 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 "Størrelsen stemmer ikke"

53
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 <piefel@debian.org>\n"
"Language-Team: <de@li.org>\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-"

339
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 <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\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 génère des fichiers d'index pour les archives Debian. Il\n"
"gère de nombreux types de génération, d'une automatisation complète à\n"
"supporte de nombreux types de génération, d'une automatisation complète à\n"
"des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n"
"\n"
"apt-ftparchive génère les fichiers de paquets à partir d'un arbre de .debs.\n"
@ -389,7 +389,7 @@ msgstr ""
"des sections\n"
"\n"
"De façon similaire, apt-ftparchive génère des fichiers de source à partir\n"
"d'un arbre de .dscs. L'option --source-override peut être utilisée pour\n"
"d'un arbre de .dscs. L'option --source-override peut être employée pour\n"
"spécifier un fichier src d'« override »\n"
"\n"
"Les commandes « packages » et « sources » devraient être démarrées à 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 " Délier %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 enlevés mais la désinstallation est désactivée."
msgstr ""
"Les paquets doivent être enlevés mais la désinstallation est désactivée."
#: 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 "Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n"
msgstr ""
"Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\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 réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
msgstr ""
"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\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 problèmes :"
msgstr ""
"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
#: 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 dépendances de compilation pour %s ne peuvent pas être satisfaites."
msgstr ""
"Les dépendances 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 ""
"précédant ce message sont importantes. Veuillez les corriger et\n"
"démarrer l'[I]nstallation une nouvelle fois."
@ -1560,7 +1568,7 @@ msgid "Internal error adding a diversion"
msgstr "Erreur interne en ajoutant une déviation"
#: 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 répondu : %s"
msgstr ""
"La commande « %s » du script de connexion a échoué, le serveur a répondu : %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 données, délai de connexion dépassé"
msgstr ""
"Impossible de se connecter sur le port de données, délai de connexion dépassé"
#: 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 formée dans la liste des sources %s (distribution absolue)"
msgstr ""
"Ligne %lu mal formée 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 formée dans la liste des sources %s (analyse de distribution)"
msgstr ""
"Ligne %lu mal formée 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 formée dans la liste des sources %s (identifiant du fournisseur)"
msgstr ""
"Ligne %u mal formée 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 réinstallé, 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 insérer quelques adresses « sources » dans votre sources.list"
msgstr ""
"Vous devez insérer 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 dépassé le nombre de noms de paquets que cet APT est capable "
"de traiter."
"Vous avez dépassé 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 dépassé le nombre de versions que cet APT est capable de "
"traiter."
"Vous avez dépassé 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 dépassé le nombre de dépendances que cet APT est capable de "
"Vous avez dépassé le nombre de dépendances 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'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
msgstr ""
"Erreur d'entrée/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 contrôle MD5 incohérente"
#: 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 incohérente"
@ -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 entièrement 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 dépendances : "
#~ 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 dépendances : "
#~ 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 étiquetés :"
#~ 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 répertoire %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 créer %s"
#~ msgid "Packages need to be removed but Remove is disabled."
#~ msgstr ""
#~ "Les paquets doivent être enlevés mais la désinstallation est désactivée."
#~ 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 "Récupération 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 insérer le disque\n"
#~ "« %s »\n"
#~ "dans le lecteur « %s » et appuyez sur la touche Entrée\n"
#~ msgid "Merging Available information"
#~ msgstr "Fusion des informations disponibles"
#~ msgid "Tar Checksum failed, archive corrupted"
#~ msgstr "Échec dans la somme de contrôle 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 N½ud"
#~ msgid "Internal Error adding a diversion"
#~ msgstr "Erreur interne en ajoutant une déviation"
#~ 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-tête « Package: », décalage %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 contrôle 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 reconnaître ce cédérom par "
#~ "votre APT. apt-get update ne peut être employé pour ajouter de nouveaux "
#~ "cédéroms"
#~ msgid "Wrong CD"
#~ msgstr "Mauvais cédérom"
#~ msgid "Server refused our connection and said: %s"
#~ msgstr "Le serveur a refusé notre connexion et a répondu : %s"
#~ msgid "Write Error"
#~ msgstr "Erreur d'écriture"
#~ msgid "The http server sent an invalid reply header"
#~ msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
#~ msgid "The http server sent an invalid Content-Length header"
#~ msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
#~ msgid "The http server sent an invalid Content-Range header"
#~ msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
#~ msgid "This http server has broken range support"
#~ msgstr "Ce serveur http possède un support des limites non-valide"
#~ msgid "Error reading from server Remote end closed connection"
#~ msgstr ""
#~ "Erreur de lecture depuis le serveur distant et clôture de la connexion"
#~ msgid "Bad header Data"
#~ msgstr "Mauvais en-tête de donnée"
#~ msgid "Syntax error %s:%u: Malformed Tag"
#~ msgstr "Erreur syntaxique %s:%u : balise mal formée"
#~ msgid "Waited, for %s but it wasn't there"
#~ msgstr "A attendu %s mais il n'était pas présent"
#~ msgid "This APT does not support the Versioning System '%s'"
#~ msgstr "Cet APT ne supporte pas le système de version « %s »"
#~ msgid "Building Dependency Tree"
#~ msgstr "Construction de l'arbre des dépendances"
#~ msgid "Candidate Versions"
#~ msgstr "Versions possibles"
#~ msgid "Dependency Generation"
#~ msgstr "Génération des dépendances"
#~ msgid "Malformed line %lu in source list %s (Absolute dist)"
#~ msgstr ""
#~ "Ligne %lu mal formée 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)"

3
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"

59
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 ""

149
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é Luís Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\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 Conteúdo %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 geração, 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 contém o conteúdo de todos os campos control de \n"
"cada pacote bem como o hash MD5 e tamanho de arquivo. Um arquivo \n"
"override é suportado para forçar 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 compilação 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 remoção 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 "Impossível criar lock no diretório 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 não pôde 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 não 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 "Impossível criar lock no diretório 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 "Impossível 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 expressão 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 ""
"Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
#: 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 ""
"distribuição instável, que alguns pacotes requeridos não 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 não instalável 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 informação a seguir pode ajudar a resolver a situação:"
#: 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 serão instalados:"