From: Michael Vogt Date: Wed, 16 Nov 2005 16:21:04 +0000 (+0000) Subject: * merged with apt--mvo--0 X-Git-Tag: 0.7.24ubuntu1~254^2~5 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7230ad48a5c7766281c824c7373ecc8900e25995?hp=-c * merged with apt--mvo--0 Patches applied: * apt@packages.debian.org/apt--sources-list-d--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-30 * apt@packages.debian.org/apt--sources-list-d--0--patch-1 Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d * bubulle@debian.org--2005/apt--main--0--patch-96 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-97 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-98 Update PO files with the POT * bubulle@debian.org--2005/apt--main--0--patch-99 Added Galician translation * bubulle@debian.org--2005/apt--main--0--patch-100 Completed Danish translation * bubulle@debian.org--2005/apt--main--0--patch-101 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-102 Merge with Michael Vogt's archive * bubulle@debian.org--2005/apt--main--0--patch-103 Update the POT files and all PO files to resync with recent code * bubulle@debian.org--2005/apt--main--0--patch-104 French translation completed * bubulle@debian.org--2005/apt--main--0--patch-105 Proofread by Fred Bothamy * bubulle@debian.org--2005/apt--main--0--patch-106 Merge with mvo * bubulle@debian.org--2005/apt--main--0--patch-107 Italian translation corrected * bubulle@debian.org--2005/apt--main--0--patch-108 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-109 Italian translation completed * bubulle@debian.org--2005/apt--main--0--patch-110 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-111 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-112 Swedish translation completed * bubulle@debian.org--2005/apt--main--0--patch-113 Silly update to French translation (testing) * bubulle@debian.org--2005/apt--main--0--patch-114 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-115 Basque translation completed * bubulle@debian.org--2005/apt--main--0--patch-116 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-117 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-118 Russian translation update by Yuri Kozlov * bubulle@debian.org--2005/apt--main--0--patch-119 Merge with Michael and add update-po as a pre-req for binary * bubulle@debian.org--2005/apt--main--0--patch-120 Re-generate all PO Files * bubulle@debian.org--2005/apt--main--0--patch-121 Complete French translation * bubulle@debian.org--2005/apt--main--0--patch-122 Correct typography in French translation * bubulle@debian.org--2005/apt--main--0--patch-123 Spelling fix for consistency in French translation * bubulle@debian.org--2005/apt--main--0--patch-124 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-125 Fixed localization of y/n questions in German translation * bubulle@debian.org--2005/apt--main--0--patch-126 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-127 Complete Tagalog translation / Add Changelog * bubulle@debian.org--2005/apt--main--0--patch-128 Danish translation update * bubulle@debian.org--2005/apt--main--0--patch-129 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-130 Galician translation completed * bubulle@debian.org--2005/apt--main--0--patch-131 Simplified Chinese translation update * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-5 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-6 * fixed a incorrect po/he.po merge * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-110 * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-1 * initial patch to make falling back from cdrom possible * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-2 * fix in methods/cdrom.cc: don't call Fail() but return false so that apt can fallback to a differencent source * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-10 * fix a bug in a man-page, fix a problem with overly long lines in apt-cdrom * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-11 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-12 * fix a incorrect error message (it always added .gz regardless what was downloaded) * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-13 * merged with main * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-14 * added Hashsum support for file and cdrom * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-15 * added README.arch * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-16 * merged with main * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-17 * move the changelog to the right place * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-18 * Change pkgPolicy::Pin from private to protected * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-19 * added a default constructor for PrvIterator * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-20 * applied otavios patch to reread the statusFile on debSystem::Initialize * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-33 * merged with matt's tree * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-34 * merged with matts tree * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-35 * build debian and ubuntu package from the same source * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-36 * added debian/patches dir * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-37 * fix the breakage from my last commit (note to self: always, _always_ run baz diff before a commit) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-38 * removed the lsb_release build patch (nobody except me seems to like it) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-39 * merged from main * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-40 * merged the apt--sane-handle-timeout--0 branch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-41 * merged apt--bts225947--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-42 * merged with apt--main * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-43 * added patch that adds a apt-secure man-page (thanks to jfs@computer.org) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-44 * added author credits * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-45 * added apt-ftparchive.conf example * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-46 * corrected the utf8 of javier fernandes pena * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-47 * improve the timeout handling (again) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-48 * merged with apt--fixes--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-49 * README.arch updates, comment in apt-pkg/algorithm.h added, apt-pkg/cacheiterators.h order in initlist changed to remove warning * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-50 * meda-change message is send over status-fd now * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-51 * include a human readable string for the MediaChange status-fd message as well * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-52 * finalizing changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-53 * check ctime as well in cron.daily when cleaning up packages in apt.cron.daily * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-54 * fix a stupid typo in apt.cron.daily * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55 * fix apt-pkg/cdrom.cc to umount the cdrom again if anything fails * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56 * merged from apt--cdrom-fallback--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-57 * changelog update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-58 * better error string for a failed dpkg-source * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-59 * make sure that the pkgRecords D'tor does not segfault * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-60 * merged updated french man-page * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-61 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62 * leak fix for debian #250583 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63 * changelog update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65 * inital support for "apt-get source -t dist" (but no downgrades yet * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66 * full support for apt-get source -t now (and honor pining too) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67 * added APT::Authentication::Trust-CDROM option * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68 * fix a crash in apt-ftparchive * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69 * sparc64 alignment fix * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70 * fix segfault when there is no Archive for a VerFile * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71 * don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72 * corrections in the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73 * init the default ScreenWidth to 79 columns by default (Closes: #324921) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74 apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75 * seting section to "admin" to match override file * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76 * finalized the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77 * renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78 * fix a incorrect example * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79 * revert patch from patch-59, causes all sorts of trouble * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80 * fix changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81 * be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83 * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84 * added armeb to archtable * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-85 * merged with bubulle, changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-86 * merged the NMU from Franz Pop, fixed armeb problem (#333599) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-87 * removed double armeb entry in buildlib/sizetable * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88 * finalized changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89 * turn off "secure-acquire" when --allow-unauthenticated is given * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-90 * merged the sources.list.d patch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-91 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-92 * changelog update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-93 * sources.list.d documented * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-3 * merged with main * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1 * implemented "TrustCDROM" mode * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2 * added APT::Authentication::TrustCDROM to the configure-index * otavio@debian.org--2005/apt--fixes--0--patch-28 Reread status configuration, needed for clients using independent apt ... * philippe.batailler@free.fr--2005/VOGTapt--mvo--0--patch-1 French L10N update * philippe.batailler@free.fr--2005/VOGTapt--mvo--0--patch-2 Generate correctly french manpages --- 7230ad48a5c7766281c824c7373ecc8900e25995 diff --combined apt-pkg/packagemanager.cc index 05615db79,155408bb4..cc87444ea --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@@ -106,7 -106,7 +106,7 @@@ bool pkgPackageManager::FixMissing( // Okay, this file is missing and we need it. Mark it for keep Bad = true; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } // We have to empty the list otherwise it will not have the new changes @@@ -631,11 -631,12 +631,11 @@@ pkgPackageManager::OrderResult pkgPacka // --------------------------------------------------------------------- /* This uses the filenames in FileNames and the information in the DepCache to perform the installation of packages.*/ -pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd) +pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd) { - OrderResult Res = OrderInstall(); - if (Res != Failed) - if (Go(status_fd) == false) - return Failed; - return Res; + if(DoInstallPreFork() == Failed) + return Failed; + - return DoInstallPostFork(); ++ return DoInstallPostFork(statusFd); } /*}}}*/ diff --combined cmdline/apt-get.cc index c8b64f5d8,48b21a31f..54c464a37 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@@ -58,7 -58,6 +58,7 @@@ #include #include #include +#include /*}}}*/ using namespace std; @@@ -67,7 -66,7 +67,7 @@@ ostream c0out(0) ostream c1out(0); ostream c2out(0); ofstream devnull("/dev/null"); - unsigned int ScreenWidth = 80; + unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */ // class CacheFile - Cover class for some dependency cache functions /*{{{*/ // --------------------------------------------------------------------- @@@ -994,7 -993,7 +994,7 @@@ bool InstallPackages(CacheFile &Cache,b cerr << _("Unable to correct missing packages.") << endl; return _error->Error(_("Aborting install.")); } - + _system->UnLock(); int status_fd = _config->FindI("APT::Status-Fd",-1); pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd); @@@ -1191,24 -1190,54 +1191,54 @@@ pkgSrcRecords::Parser *FindSrc(const ch string VerTag; string TmpSrc = Name; string::size_type Slash = TmpSrc.rfind('='); + + // honor default release + string DefRel = _config->Find("APT::Default-Release"); + pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); + if (Slash != string::npos) { VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end()); TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash); + } + else if(!Pkg.end() && DefRel.empty() == false) + { + // we have a default release, try to locate the pkg. we do it like + // this because GetCandidateVer() will not "downgrade", that means + // "apt-get source -t stable apt" won't work on a unstable system + for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; + Ver++) + { + for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; + VF++) + { + /* If this is the status file, and the current version is not the + version in the status file (ie it is not installed, or somesuch) + then it is not a candidate for installation, ever. This weeds + out bogus entries that may be due to config-file states, or + other. */ + if ((VF.File()->Flags & pkgCache::Flag::NotSource) == + pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver) + continue; + + //std::cout << VF.File().Archive() << std::endl; + if(VF.File().Archive() && (VF.File().Archive() == DefRel)) + { + VerTag = Ver.VerStr(); + break; + } + } + } } - + /* Lookup the version of the package we would install if we were to install a version and determine the source package name, then look - in the archive for a source package of the same name. In theory - we could stash the version string as well and match that too but - today there aren't multi source versions in the archive. */ - if (_config->FindB("APT::Get::Only-Source") == false && - VerTag.empty() == true) + in the archive for a source package of the same name. */ + if (_config->FindB("APT::Get::Only-Source") == false) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); if (Pkg.end() == false) { - pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); + pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); if (Ver.end() == false) { pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); @@@ -1266,10 -1295,7 +1296,7 @@@ } } - if (Last == 0) - return 0; - - if (Last->Jump(Offset) == false) + if (Last == 0 || Last->Jump(Offset) == false) return 0; return Last; @@@ -1358,52 -1384,6 +1385,52 @@@ bool DoUpdate(CommandLine &CmdL return true; } /*}}}*/ +// DoAutomaticRemove - Remove all automatic unused packages /*{{{*/ +// --------------------------------------------------------------------- +/* Remove unused automatic packages */ +bool DoAutomaticRemove(CacheFile &Cache) +{ + if(_config->FindI("Debug::pkgAutoRemove",false)) + std::cout << "DoAutomaticRemove()" << std::endl; + + if (_config->FindB("APT::Get::Remove",true) == false) + return _error->Error(_("We are not supposed to delete stuff, can't " + "start AutoRemover")); + + { + pkgDepCache::ActionGroup group(*Cache); + + // look over the cache to see what can be removed + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) + { + if (Cache[Pkg].Garbage) + { + if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) + fprintf(stdout,"We could delete %s\n", Pkg.Name()); + + if(Pkg.CurrentVer() != 0 && Pkg->CurrentState != pkgCache::State::ConfigFiles) + Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false)); + else + Cache->MarkKeep(Pkg, false, false); + } + } + } + + // Now see if we destroyed anything + if (Cache->BrokenCount() != 0) + { + c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n" + "shouldn't happen. Please file a bug report against apt.") << endl; + c1out << endl; + c1out << _("The following information may help to resolve the situation:") << endl; + c1out << endl; + ShowBroken(c1out,Cache,false); + + return _error->Error(_("Internal Error, AutoRemover broke stuff")); + } + return true; +} + // DoUpgrade - Upgrade all packages /*{{{*/ // --------------------------------------------------------------------- /* Upgrade all packages without installing new packages or erasing old @@@ -1455,11 -1435,6 +1482,11 @@@ bool DoInstall(CommandLine &CmdL bool DefRemove = false; if (strcasecmp(CmdL.FileList[0],"remove") == 0) DefRemove = true; + else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0) + { + _config->Set("APT::Get::AutomaticRemove", "true"); + DefRemove = true; + } for (const char **I = CmdL.FileList + 1; *I != 0; I++) { @@@ -1609,11 -1584,6 +1636,11 @@@ return _error->Error(_("Broken packages")); } + if (_config->FindB("APT::Get::AutomaticRemove")) { + if (!DoAutomaticRemove(Cache)) + return false; + } + /* Print out a list of packages that are going to be installed extra to what the user asked */ if (Cache->InstCount() != ExpectedInst) @@@ -1633,8 -1603,8 +1660,8 @@@ if (*J == 0) { List += string(I.Name()) + " "; - VersionsList += string(Cache[I].CandVersion) + "\n"; - } + VersionsList += string(Cache[I].CandVersion) + "\n"; + } } ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList); @@@ -1716,7 -1686,7 +1743,7 @@@ // See if we need to prompt if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); - + return InstallPackages(Cache,false); } /*}}}*/ @@@ -2070,6 -2040,7 +2097,7 @@@ bool DoSource(CommandLine &CmdL if (system(S) != 0) { fprintf(stderr,_("Unpack command '%s' failed.\n"),S); + fprintf(stderr,_("Check if the 'dpkg-dev' package is installed.\n")); _exit(1); } } @@@ -2478,7 -2449,6 +2506,7 @@@ void GetInitialize( _config->Set("APT::Get::Fix-Broken",false); _config->Set("APT::Get::Force-Yes",false); _config->Set("APT::Get::List-Cleanup",true); + _config->Set("APT::Get::AutomaticRemove",false); } /*}}}*/ // SigWinch - Window size change signal handler /*{{{*/ @@@ -2534,7 -2504,6 +2562,7 @@@ int main(int argc,const char *argv[] {0,"remove","APT::Get::Remove",0}, {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, + {0,"auto-remove","APT::Get::AutomaticRemove",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, @@@ -2543,7 -2512,6 +2571,7 @@@ {"upgrade",&DoUpgrade}, {"install",&DoInstall}, {"remove",&DoInstall}, + {"autoremove",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, {"dselect-upgrade",&DoDSelectUpgrade}, {"build-dep",&DoBuildDep}, diff --combined configure.in index 614c41352,6130ab544..bc5d2b572 --- a/configure.in +++ b/configure.in @@@ -18,7 -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.40.2") -AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3") ++AC_DEFINE_UNQUOTED(VERSION,"0.6.42.4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --combined debian/changelog index af57cc2b4,2a636ae30..8ebc2e755 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,118 +1,118 @@@ - apt (0.6.40.2) unstable; urgency=low + apt (0.6.42.4) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: + * zh_CN.po: Completed to 507 strings(Closes: #338267) + * gl.po: Completed to 510 strings (Closes: #338356) + * added support for "/etc/apt/sources.list.d" directory + (closes: #66325) + - -- ++ -- Michael Vogt Wed, 16 Nov 2005 17:13:05 +0100 + + apt (0.6.42.3) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: + - patch-118: Russian translation update by Yuri Kozlov (closes: #335164) + - patch-119: add update-po as a pre-req for binary (closes: #329910) + - patch-121: Complete French translation + - patch-125: Fixed localization of y/n questions in German translation + (closes: #337078) + - patch-126: Swedish translation update (closes: #337163) + - patch-127: Complete Tagalog translation (closes: #337306) + - patch-128: Danish translation update (closes: #337949) + - patch-129: Basque translation update (closes: #338101) + * cmdline/apt-get.cc: + - bufix in FindSrc (closes: #335213, #337910) + * added armeb to archtable (closes: #333599) + * with --allow-unauthenticated use the old fallback behaviour for + sources (closes: #335112) + + -- Michael Vogt Wed, 9 Nov 2005 07:22:31 +0100 + + apt (0.6.42.2) unstable; urgency=high + + * NMU (approved by maintainer) + * Add AMD64 archive signing key to debian-archive.gpg (closes: #336500). + * Add big-endian arm (armeb) support (closes: #333599). + * Priority high to get the AMD key into testing ASAP. + + -- Frans Pop Sun, 30 Oct 2005 21:29:11 +0100 + + apt (0.6.42.1) unstable; urgency=low + + * fix a incorrect example in the apt_prefrences man page + (thanks to Filipus Klutiero, closes: #282918) + * apt-pkg/pkgrecords.cc: + - revert patch from last version, it causes trouble on alpha + and ia64 (closes: #335102, #335103) + * cmdline/apt-get.cc: + - be extra carefull in FindSrc (closes: #335213) + + -- Michael Vogt Sat, 22 Oct 2005 23:44:35 +0200 + + apt (0.6.42) unstable; urgency=low + + * apt-pkg/cdrom.cc: + - unmount the cdrom when apt failed to locate any package files + * allow cdrom failures and fallback to other sources in that case + (closes: #44135) + * better error text when dpkg-source fails + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115: + - patch-99: Added Galician translation + - patch-100: Completed Danish translation (Closes: #325686) + - patch-104: French translation completed + - patch-109: Italian translation completed + - patch-112: Swedish translation update + - patch-115: Basque translation completed (Closes: #333299) + * applied french man-page update (thanks to Philippe Batailler) + (closes: #316638, #327456) + * fix leak in the mmap code, thanks to Daniel Burrows for the + patch (closes: #250583) + * support for apt-get [build-dep|source] -t (closes: #152129) + * added "APT::Authentication::TrustCDROM" option to make the life + for the installer people easier (closes: #334656) + * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch) + (closes: #334671) + * apt-pkg/contrib/md5.cc: + - fix a alignment problem on sparc64 that gives random bus errors + (thanks to Fabbione for providing a test-case) + * init the default ScreenWidth to 79 columns by default + (Closes: #324921) + * cmdline/apt-cdrom.cc: + - fix some missing gettext() calls (closes: #334539) + * doc/apt-cache.8.xml: fix typo (closes: #334714) + + -- Michael Vogt Wed, 19 Oct 2005 22:02:09 +0200 + + apt (0.6.41) unstable; urgency=low * improved the support for "error" and "conffile" reporting from dpkg, added the format to README.progress-reporting * added README.progress-reporting to the apt-doc package - * automatic removal of unused dependencies + * improved the network timeout handling, if a index file from a + sources.list times out or EAI_AGAIN is returned from getaddrinfo, + don't try to get the other files from that entry + * Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + * Javier Fernandez-Sanguino Pen~a: + - Added a first version of an apt-secure.8 manpage, and modified + apt-key and apt.end accordingly. Also added the 'update' + argument to apt-key which was previously not documented + (Closes: #322120) + * Andreas Pakulat: + - added example apt-ftparchive.conf file to doc/examples + (closes: #322483) + * Fix a incorrect example in the man-page (closes: #282918) + * Fix a bug for very long lines in the apt-cdrom code (closes: #280356) + * Fix a manual page bug (closes: #316314) + * Do md5sum checking for file and cdrom method (closes: #319142) + * Change pkgPolicy::Pin from private to protected to let subclasses + access it too (closes: #321799) + * add default constructor for PrvIterator (closes: #322267) + * Reread status configuration on debSystem::Initialize() + (needed for apt-proxy, thanks to Otavio for this patch) - -- Michael Vogt Thu, 18 Aug 2005 11:09:25 +0200 + -- Michael Vogt Mon, 5 Sep 2005 22:59:03 +0200 apt (0.6.40.1) unstable; urgency=low @@@ -73,7 -180,6 +180,7 @@@ apt (0.6.37) breezy; urgency=lo * Add Welsh translation from Dafydd Harries (daf@muse.19inch.net--2005/apt--main--0--patch-1) * Change debian/bugscript to use #!/bin/bash (Closes: #313402) + * Fix a incorrect example in the man-page (closes: #282918) -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 diff --combined debian/rules index 3bc9f53d9,cd026b4a4..94e3e2216 --- a/debian/rules +++ b/debian/rules @@@ -209,7 -209,7 +209,7 @@@ apt: build debian/shlibs.loca cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + cp share/debian-archive.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog @@@ -269,6 -269,7 +269,7 @@@ apt-utils: build debian/shlibs.loca cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/ dh_installdocs -p$@ + dh_installexamples -p$@ # Install the man pages.. dh_installman -p$@ @@@ -336,4 -337,4 +337,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) diff --combined doc/examples/configure-index index 2c16cd31f,a93b74349..50ca5084b --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@ -24,15 -24,11 +24,15 @@@ AP { Architecture "i386"; Build-Essential "build-essential"; - + + NeverAutoRemove { "linux-kernel.*"; }; // packages that should never + // considered for autoRemove + // Options for apt-get Get { Arch-Only "false"; + AutomaticRemove "false"; Download-Only "false"; Simulate "false"; Assume-Yes "false"; @@@ -76,6 -72,11 +76,11 @@@ NoAct "false"; }; + Authentication + { + TrustCDROM "false"; // consider the CDROM always trusted + }; + GPGV { TrustedKeyring "/etc/apt/trusted.gpg"; @@@ -247,8 -248,7 +252,8 @@@ Debu pkgDPkgPM "false"; pkgDPkgProgressReporting "false"; pkgOrderList "false"; - + pkgAutoRemove "false"; // show information about automatic removes + pkgInitialize "false"; // This one will dump the configuration space NoLocking "false"; Acquire::Ftp "false"; // Show ftp command traffic diff --combined po/apt-all.pot index bca32b327,7ed987c02..4d9621307 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-11-02 18:56-0500\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -148,7 -148,7 +148,7 @@@ msgstr " #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 - #: cmdline/apt-get.cc:2375 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@@ -192,6 -192,18 +192,18 @@@ msgid " "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "" @@@ -231,7 -243,7 +243,7 @@@ msgid " " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "" @@@ -414,12 -426,12 +426,12 @@@ msgstr " msgid "Archive had no package field" msgstr "" - #: ftparchive/writer.cc:394 ftparchive/writer.cc:602 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr "" - #: ftparchive/writer.cc:437 ftparchive/writer.cc:688 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" @@@ -519,221 -531,221 +531,221 @@@ msgstr " msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:118 +#: cmdline/apt-get.cc:119 msgid "Y" msgstr "" - #: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1532 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:235 +#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:339 +#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:344 +#: cmdline/apt-get.cc:345 msgid " or" msgstr "" -#: cmdline/apt-get.cc:373 +#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:399 +#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:463 +#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:483 +#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:536 +#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:544 +#: cmdline/apt-get.cc:545 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:575 +#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:579 +#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:647 +#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:651 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:659 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:691 +#: cmdline/apt-get.cc:692 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:698 +#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:754 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:762 +#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:774 msgid "Internal error, Ordering didn't finish" msgstr "" - #: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1831 cmdline/apt-get.cc:1864 -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1912 cmdline/apt-get.cc:2123 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:815 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:827 +#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:845 cmdline/apt-get.cc:1978 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:864 +#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:867 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -741,74 -753,74 +753,74 @@@ " ?] " msgstr "" -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:887 +#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "" - #: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1337 cmdline/apt-get.cc:2021 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:993 +#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1038 +#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -816,97 -828,79 +828,97 @@@ "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1108 +#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1131 +#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1174 +#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" - #: cmdline/apt-get.cc:1285 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1437 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1356 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1370 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + - #: cmdline/apt-get.cc:1395 ++#: cmdline/apt-get.cc:1422 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + - #: cmdline/apt-get.cc:1398 cmdline/apt-get.cc:1600 ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 +msgid "The following information may help to resolve the situation:" +msgstr "" + - #: cmdline/apt-get.cc:1402 ++#: cmdline/apt-get.cc:1429 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + - #: cmdline/apt-get.cc:1420 ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1519 cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1542 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1572 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1575 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1587 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -914,149 -908,158 +926,154 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1595 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" "that package should be filed." msgstr "" - #: cmdline/apt-get.cc:1603 -#: cmdline/apt-get.cc:1585 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1634 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1705 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1706 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1726 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1729 methods/ftp.cc:702 methods/connect.cc:101 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:1734 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:1799 cmdline/apt-get.cc:1807 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 msgid "Internal error, problem resolver broke stuff" msgstr "" - #: cmdline/apt-get.cc:1907 -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1934 cmdline/apt-get.cc:2141 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1981 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1986 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1989 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1995 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2026 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2054 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2066 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2083 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2102 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2118 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2146 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2166 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2270 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:2305 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2330 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2344 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2348 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2380 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2421 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1310,7 -1313,7 +1327,8 @@@ msgid "File %s/%s overwrites the one i msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 --#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@@ -1340,9 -1343,9 +1358,9 @@@ msgid "The info and temp directories ne msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 +#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 +#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "" @@@ -1446,27 -1449,31 +1464,31 @@@ msgstr " msgid "Unparsable control file" msgstr "" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + msgid "Disk not found." + msgstr "" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "" @@@ -1479,7 -1486,7 +1501,7 @@@ msgstr " msgid "Failed to set modification time" msgstr "" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "" @@@ -1670,17 -1677,17 +1692,17 @@@ msgstr " msgid "Could not resolve '%s'" msgstr "" - #: methods/connect.cc:169 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" - #: methods/connect.cc:171 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" - #: methods/connect.cc:218 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "" @@@ -2079,27 -2086,18 +2101,27 @@@ msgstr " msgid "extra" msgstr "" - #: apt-pkg/depcache.cc:89 apt-pkg/depcache.cc:118 -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "" - #: apt-pkg/depcache.cc:90 -#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "" - #: apt-pkg/depcache.cc:119 -#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "" - #: apt-pkg/depcache.cc:140 apt-pkg/depcache.cc:159 apt-pkg/depcache.cc:163 ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 +msgid "Reading state information" +msgstr "" + - #: apt-pkg/depcache.cc:179 ++#: apt-pkg/depcache.cc:189 +#, c-format +msgid "Failed to write StateFile %s" +msgstr "" + #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2110,52 -2108,52 +2132,52 @@@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" --#: apt-pkg/sourcelist.cc:191 ++#: apt-pkg/sourcelist.cc:244 #, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@@ -2173,19 -2171,19 +2195,19 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@@ -2204,22 -2202,27 +2226,27 @@@ msgstr " msgid "Downloading file %li of %li (%s remaining)" msgstr "" - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "" - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2253,82 -2256,82 +2280,82 @@@ msgstr " msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "" @@@ -2337,31 -2340,31 +2364,31 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:906 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" - #: apt-pkg/acquire-item.cc:720 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" - #: apt-pkg/acquire-item.cc:773 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" - #: apt-pkg/acquire-item.cc:809 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:896 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" @@@ -2370,73 -2373,73 +2397,73 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "" - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "" - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "" diff --combined po/bs.po index 806c1204d,e79db9027..2be6feec2 --- a/po/bs.po +++ b/po/bs.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@@ -146,8 -146,8 +146,8 @@@ msgid " %4i %s\n msgstr "" #: 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@@ -191,6 -191,18 +191,18 @@@ msgid " "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenti nisu u parovima" @@@ -242,7 -254,7 +254,7 @@@ msgid " " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@@ -252,31 -264,31 +264,31 @@@ msgid "Cannot get debconf version. Is d msgstr "" "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -318,11 -330,11 +330,11 @@@ " -o=? Set an arbitrary configuration option" msgstr "" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" @@@ -355,83 -367,83 +367,83 @@@ msgstr "Arhiva nema kontrolnog zapisa msgid "Unable to get a cursor" msgstr "" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "" - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "" - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "" - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Ne mogu otvoriti %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr "" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr "" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" @@@ -531,202 -543,223 +543,223 @@@ msgstr " msgid "Failed to rename %s to %s" msgstr "" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ali se ne može instalirati" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ali nije instaliran" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ili" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "" --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "" --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "" --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Ispravljam zavisnosti..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr "" --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Ne mogu ispraviti zavisnosti" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Urađeno" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. PokuÅ¡ajte koristeći -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "" --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Da, uradi kako kažem!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -734,75 -767,75 +767,75 @@@ " ?] " msgstr "" - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Odustani." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Odustajem od instalacije." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "[Instalirano]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -810,79 -843,79 +843,97 @@@ "is only available from another source\n" msgstr "" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Međutim, slijedeći paketi ga zamjenjuju:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1429 ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -890,149 -923,158 +941,154 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" "that package should be filed." msgstr "" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "OÅ¡tećeni paketi" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Predloženi paketi:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Preporučeni paketi:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "NeuspjeÅ¡no" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Urađeno" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Podržani moduli:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1285,8 -1327,8 +1341,9 @@@ msgstr " msgid "File %s/%s overwrites the one in the package %s" msgstr "" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" @@@ -1316,9 -1358,9 +1373,9 @@@ msgid "The info and temp directories ne msgstr "" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Čitam spiskove paketa" @@@ -1422,40 -1464,46 +1479,46 @@@ msgstr " msgid "Unparsable control file" msgstr "" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 #, fuzzy msgid "Wrong CD-ROM" msgstr "PogreÅ¡an CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se joÅ¡ uvijek koristi." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Datoteka nije pronađena" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datoteka nije pronađena" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "" @@@ -1511,7 -1559,7 +1574,7 @@@ msgstr " msgid "Server closed the connection" msgstr "Server je zatvorio vezu" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "GreÅ¡ka pri čitanju" @@@ -1524,7 -1572,7 +1587,7 @@@ msgstr " msgid "Protocol corruption" msgstr "OÅ¡tećenje protokola" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "GreÅ¡ka pri pisanju" @@@ -1625,43 -1673,80 +1688,80 @@@ msgstr " msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se sa %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ne mogu se povezati sa %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + msgid "Could not execute " + msgstr "" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Slijedeći dodatni paketi će biti instalirani:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1745,10 -1830,6 +1845,6 @@@ msgstr "Povezivanje neuspjeÅ¡no msgid "Internal error" msgstr "UnutraÅ¡nja greÅ¡ka" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "" @@@ -1763,57 -1844,57 +1859,57 @@@ msgstr " msgid "Selection %s not found" msgstr "" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@@ -1879,7 -1960,7 +1975,7 @@@ msgstr " msgid "Unable to stat the mount point %s" msgstr "" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@@ -1888,70 -1969,70 +1984,70 @@@ msgid "Failed to stat the cdrom" msgstr "" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "" @@@ -2025,18 -2106,18 +2121,28 @@@ msgstr "opcionalno msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Gradim stablo zavisnosti" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Verzije kandidata" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Stvaranje zavisnosti" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Sastavljam dostupne informacije" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Ne mogu ukloniti %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2047,52 -2128,52 +2153,52 @@@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otvaram %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" --#: apt-pkg/sourcelist.cc:191 ++#: apt-pkg/sourcelist.cc:244 #, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@@ -2110,48 -2191,58 +2216,58 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "" - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "" - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "" - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2185,82 -2276,82 +2301,82 @@@ msgstr " msgid "No priority (or zero) specified for pin" msgstr "" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "" @@@ -2269,31 -2360,31 +2385,31 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" @@@ -2302,75 -2393,75 +2418,75 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "" - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 #, fuzzy msgid "Waiting for disc...\n" msgstr "Čekam na zaglavlja" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 #, fuzzy msgid "Copying package lists..." msgstr "Čitam spiskove paketa" - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "" @@@ -2393,3 -2484,57 +2509,57 @@@ msgstr " #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Otvaram %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Otvaram %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, c-format + msgid "Preparing to configure %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Povezujem se sa %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instalirano:" + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Otvaram %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Preporučuje" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "" diff --combined po/ca.po index 7fe93910e,a49bc03f9..2578ce741 --- a/po/ca.po +++ b/po/ca.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-07-19 01:31+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@@ -149,8 -149,8 +149,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per a %s %s compilat el %s %s\n" @@@ -230,6 -230,22 +230,22 @@@ msgstr " "Consulteu les pàgines del manual apt-cache(8) i apt.conf(5) per a més " "informació.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n" + " '%s'\n" + "en la unitat de '%s' i premeu Intro\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Els arguments no són en parells" @@@ -291,7 -307,7 +307,7 @@@ msgstr " " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@@ -300,31 -316,31 +316,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "No es pot determinar la versió de debconf. Està instal·lat debconf?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "La llista de les extensions dels paquets és massa llarga" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "S'ha produït un error en processar el directori %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "La llista d'extensions de les fonts és massa llarga" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "S'ha produït un error en processar el fitxer de continguts %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -405,11 -421,11 +421,11 @@@ msgstr " " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració arbitrària" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "No s'ha trobat cap selecció" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'" @@@ -442,83 -458,83 +458,83 @@@ msgstr "Arxiu sense registre de control msgid "Unable to get a cursor" msgstr "No es pot aconseguir un cursor" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No es pot llegir el directori %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No es pot veure l'estat %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "A: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Els errors s'apliquen al fitxer " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "No s'ha pogut resoldre %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "L'arbre està fallant" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "No s'ha pogut obrir %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "No s'ha pogut llegir l'enllaç %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "No s'ha pogut alliberar %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No s'ha pogut enllaçar %s a %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink s'ha arribat al límit de %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "No es pot determinar l'estat de %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" @@@ -618,79 -634,79 +634,79 @@@ msgstr "S'ha trobat un problema treien msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "però està instal·lat %s" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "però s'instal·larà %s" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "però no és instal·lable" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "però és un paquet virtual" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "però no està instal·lat" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "però no serà instal·lat" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " o" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "S'instal·laran els següents paquets NOUS:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "S'ELIMINARAN els següents paquets:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "S'han mantingut els següents paquets:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els següents paquets:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els següents paquets:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Es canviaran els següents paquets mantinguts:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -698,122 -714,146 +714,146 @@@ msgstr " "AVÍS: Els següents paquets essencials seran eliminats.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instal·lar, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstal·lats, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a eliminar i %lu no actualitzats.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instal·lats o eliminats completament.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "S'estan corregint les dependències..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " ha fallat." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "No es poden corregir les dependències" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "No es pot minimitzar el joc de versions revisades" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Fet" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dependències sense satisfer. Proveu-ho usant -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els següents paquets!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "S'ha descartat l'avís d'autenticació.\n" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " + "trencats!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "S'ha produït un error intern, l'ordenació no ha acabat" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + "Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es necessita obtenir %sB/%sB d'arxius.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es necessita obtenir %sB d'arxius.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "No s'ha pogut determinar l'espai lliure en %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Es va especificar Trivial Only però aquesta operació no és trivial." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -824,28 -864,28 +864,28 @@@ msgstr " "Per a continuar escriviu la frase «%s»\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Avortat." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -853,48 -893,48 +893,48 @@@ msgstr " "No es poden descarregar alguns arxius, potser executant apt-get update o " "intenteu-ho amb --fix-missing." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "S'està avortant la instal·lació." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota: s'està seleccionant %s en comptes de %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquet %s és un paquet virtual proveït per:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instal·lat]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -905,50 -945,50 +945,50 @@@ msgstr " "en fa referència. Això normalment vol dir que el paquet falta,\n" "s'ha tornat obsolet o només és disponible des d'una altra font.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Tot i que els següents paquets el reemplacen:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquet %s no té candidat d'instal·lació" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No s'ha trobat la versió «%s» per a «%s»" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -956,25 -996,25 +996,45 @@@ msgstr " "No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " "s'han usat els antics." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "La següent informació pot ajudar-vos a resoldre la situació:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "" ++"S'ha produït un error intern, el solucionador de problemes ha trencat coses" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -982,7 -1022,7 +1042,7 @@@ msgstr " "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -994,7 -1034,7 +1054,7 @@@ msgstr " "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1004,109 -1044,119 +1064,115 @@@ msgstr " "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" "un informe d'error en contra d'aquest per a arxivar-lo." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "La següent informació pot ajudar-vos a resoldre la situació:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Paquets trencats" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Paquets suggerits:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Paquets recomanats:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ha fallat" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Fet" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "" + "S'ha produït un error intern, el solucionador de problemes ha trencat coses" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a descarregar" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Ha fallat el procés fill" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1115,7 -1165,7 +1181,7 @@@ msgstr " "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1124,32 -1174,32 +1190,32 @@@ msgstr " "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " "és massa nou" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Mòduls suportats:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1459,8 -1509,8 +1525,9 @@@ msgstr "S'està sobreescrivint el corre msgid "File %s/%s overwrites the one in the package %s" msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" @@@ -1492,9 -1542,9 +1559,9 @@@ msgstr " "fitxers" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" @@@ -1601,12 -1651,12 +1668,12 @@@ msgstr "No s'ha trobat un fitxer de con msgid "Unparsable control file" msgstr "El fitxer de control no es pot analitzar" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "No es pot llegir la base de dades del cdrom %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1614,28 -1664,34 +1681,34 @@@ msgstr " "Si us plau, useu apt-cdrom per a que aquest CD sigui reconegut per APT. No " "pot usar-se apt-get update per afegir-ne de nous" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD erroni" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Fitxer no trobat" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fitxer no trobat" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "L'estat ha fallat" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "URI no vàlid, els URI locals no han de començar per //" @@@ -1693,7 -1749,7 +1766,7 @@@ msgstr "Temps de connexió finalitzat msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@@ -1705,7 -1761,7 +1778,7 @@@ msgstr "Una resposta ha desbordat la me msgid "Protocol corruption" msgstr "Protocol corrumput" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Error d'escriptura" @@@ -1807,43 -1863,85 +1880,85 @@@ msgstr "No s'ha pogut crear un sòcol p msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "No es pot iniciar la connexió amb %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No s'ha pogut connectar amb %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "S'està connectant amb %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "No s'ha pogut resoldre '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "S'ha produït un error temporal en resoldre '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Ha passat alguna cosa estranya en resoldre '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "No es pot connectar amb %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " + "sortint." + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + "Error intern: La signatura és correcta, però no s'ha pogut determinar " + "l'emprempta digital de la clau!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "S'ha trobat almenys una signatura invàlida." + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + msgid "Could not execute " + msgstr "No s'ha pogut executar " + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr " per a verificar la signatura (està instal·lat el gnupg?)" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "S'ha produït un error desconegut en executar el gpgv" + + #: methods/gpgv.cc:237 + msgid "The following signatures were invalid:\n" + msgstr "Les següents signatures són invàlides:\n" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + "Les següents signatures no s'han pogut verificar perquè la clau pública no " + "està disponible:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1927,10 -2025,6 +2042,6 @@@ msgstr "Ha fallat la connexió msgid "Internal error" msgstr "Error intern" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "La connexió s'ha tancat prematurament" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "No es pot transferir un fitxer buit a memòria" @@@ -1945,57 -2039,57 +2056,57 @@@ msgstr "No s'ha pogut crear un mapa de msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreujament de tipus no reconegut: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "S'està obrint el fitxer de configuració %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Línia %d massa llarga (màx %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error sintàctic %s:%u: No comença el camp amb un nom." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error sintàctic %s:%u: Etiqueta malformada" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error sintàctic %s:%u Text extra després del valor" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include aniuats" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error sintàctic %s:%u: Inclusió des d'aqui" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error sintàctic %s:%u: Directriu no suportada '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error sintàctic %s:%u: Text extra al final del fitxer" @@@ -2061,7 -2155,7 +2172,7 @@@ msgstr "Operació no vàlida %s msgid "Unable to stat the mount point %s" msgstr "No es pot obtenir informació del punt de muntatge %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "No es pot canviar a %s" @@@ -2070,70 -2164,70 +2181,70 @@@ msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No s'usen blocats per a llegir el fitxer de blocat de sols lectura %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "No es pot resoldre el fixter de blocat %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No s'usen blocats per al fitxer de blocat %s de muntar nfs" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-procés %s ha rebut una violació de segment." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-procés %s ha retornat un codi d'error (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-procés %s ha eixit inesperadament" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "llegits, falten %lu per llegir, però no queda res" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrits, falten %lu per escriure però no s'ha pogut" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Ha hagut un problema en tancar el fitxer" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Ha hagut un problema en desenllaçar el fitxer" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@@ -2206,18 -2300,18 +2317,28 @@@ msgstr "opcional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "S'està construint l'arbre de dependències" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versions candidates" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Dependències que genera" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "S'està fusionant la informació disponible" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "No s'ha pogut escriure el fitxer %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2228,52 -2322,52 +2349,52 @@@ msgstr "No es pot analitzar el fitxer d msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)" @@@ -2295,14 -2389,14 +2416,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "El tipus de fitxer índex '%s', no està suportat" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2310,38 -2404,51 +2431,51 @@@ msgstr " "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " "causat per paquets mantinguts." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No es poden corregir els problemes, teniu paquets mantinguts que estan " "trencats." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Falta el directori de llistes %spartial." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Falta el directori d'arxiu %spartial." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "No s'ha pogut trobar el mètode de control %s." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n" + " '%s'\n" + "en la unitat de '%s' i premeu Intro\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetament '%s' no està suportat." --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." @@@ -2377,86 -2484,86 +2511,86 @@@ msgstr "No s'ha entès el pin de tipus msgid "No priority (or zero) specified for pin" msgstr "No hi ha prioritat especificada per al pin (o és zero)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "La memòria cau té un sistema de versions incompatible" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "S'ha produït un error durant el processament de %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "S'ha produït un error durant el processament de %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "S'ha produït un error durant el processament de %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "S'ha produït un error durant el processament de %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "S'ha produït un error durant el processament de %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "S'ha produït un error durant el processament de %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Uau, heu excedit el nombre de paquets dels que aquest APT és capaç." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, heu excedit el nombre de versions de les que aquest APT és capaç. " --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, heu excedit el nombre de dependències de les que aquest APT és capaç." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "S'ha produït un error durant el processament de %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" "S'ha produït un error durant el processament de %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" @@@ -2465,11 -2572,11 +2599,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2479,7 -2586,7 +2613,7 @@@ msgstr " "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2488,7 -2595,7 +2622,7 @@@ msgstr " "No ha estat possible localitzar un fitxer pel paquet %s. Això podria " "significar que haureu d'arreglar aquest paquet manualment." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2496,7 -2603,7 +2630,7 @@@ msgstr " "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Mida diferent" @@@ -2505,7 -2612,7 +2639,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "El camp del proveïdor %s no té una empremta digital" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2514,47 -2621,47 +2648,47 @@@ msgstr " "S'està utilitzant el punt de muntatge de CD-ROM %s\n" "S'està muntant el CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "S'està identificant..." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "S'ha emmagatzemat l'etiqueta: %s\n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "S'està desmuntant el CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "S'està esperant al disc...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "S'està muntant el CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "S'està analitzant el disc per a fitxers d'índex...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "S'han trobat %i índex de paquets, %i índex de fonts i %i signatures\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2563,19 -2670,19 +2697,19 @@@ msgstr " "El disc es diu:\n" "«%s»\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "S'estan copiant les llistes de paquets..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "S'està escrivint una nova llista de fonts\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "S'esta desmuntant el CD-ROM..." @@@ -2601,62 -2708,59 +2735,59 @@@ msgstr " "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " "coincidents\n" - #~ msgid "Authentication warning overridden.\n" - #~ msgstr "S'ha descartat l'avís d'autenticació.\n" - - #~ msgid "Internal error, InstallPackages was called with broken packages!" - #~ msgstr "" - #~ "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " - #~ "trencats!" - - #~ msgid "Internal error, Ordering didn't finish" - #~ msgstr "S'ha produït un error intern, l'ordenació no ha acabat" - - #~ msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" - #~ msgstr "" - #~ "Què estrany... les mides no coincideixen, informeu a apt@packages.debian." - #~ "org" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "S'està obrint %s" - #~ msgid "Couldn't determine free space in %s" - #~ msgstr "No s'ha pogut determinar l'espai lliure en %s" + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "S'està obrint %s" - #~ msgid "Internal error, problem resolver broke stuff" - #~ msgstr "" - #~ "S'ha produït un error intern, el solucionador de problemes ha trencat " - #~ "coses" + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "S'està obrint el fitxer de configuració %s" - #~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." - #~ msgstr "" - #~ "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " - #~ "sortint." + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "S'està connectant amb %s" ++msgstr "" - #~ msgid "" - #~ "Internal error: Good signature, but could not determine key fingerprint?!" - #~ msgstr "" - #~ "Error intern: La signatura és correcta, però no s'ha pogut determinar " - #~ "l'emprempta digital de la clau!" + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instal·lat: " - #~ msgid "At least one invalid signature was encountered." - #~ msgstr "S'ha trobat almenys una signatura invàlida." + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" - #~ msgid "Could not execute " - #~ msgstr "No s'ha pogut executar " + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "S'està obrint %s" - #~ msgid " to verify signature (is gnupg installed?)" - #~ msgstr " per a verificar la signatura (està instal·lat el gnupg?)" + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Recomana" ++msgstr "" - #~ msgid "Unknown error executing gpgv" - #~ msgstr "S'ha produït un error desconegut en executar el gpgv" + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" - #~ msgid "The following signatures were invalid:\n" - #~ msgstr "Les següents signatures són invàlides:\n" + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" - #~ msgid "" - #~ "The following signatures couldn't be verified because the public key is " - #~ "not available:\n" - #~ msgstr "" - #~ "Les següents signatures no s'han pogut verificar perquè la clau pública " - #~ "no està disponible:\n" + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "La connexió s'ha tancat prematurament" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" diff --combined po/cs.po index 28f683d1a,0b590f885..2ff41d511 --- a/po/cs.po +++ b/po/cs.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-11 16:14+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@@ -146,8 -146,8 +146,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" @@@ -226,6 -226,22 +226,22 @@@ msgstr " " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" "Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Výměna média: Vložte disk nazvaný\n" + " '%s'\n" + "do mechaniky '%s' a stiskněte enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenty nejsou v párech" @@@ -286,7 -302,7 +302,7 @@@ msgstr " " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Nemohu zapsat do %s" @@@ -295,31 -311,31 +311,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nemohu určit verzi programu debconf. Je debconf nainstalován?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Seznam rozšíření balíku je příliÅ¡ dlouhý" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Chyba zpracování adresáře %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Seznam zdrojových rozšíření je příliÅ¡ dlouhý" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Chyba při zapisování hlavičky do souboru" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Chyba při zpracovávání obsahu %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -400,11 -416,11 +416,11 @@@ msgstr " " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Žádný výběr nevyhověl" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Některé soubory chybí v balíkovém souboru skupiny %s" @@@ -437,83 -453,83 +453,83 @@@ msgstr "Archív nemá kontrolní zázna msgid "Unable to get a cursor" msgstr "Nemohu získat kurzor" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nemohu číst adresář %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nemohu vyhodnotit %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Chyby se týkají souboru " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Chyba při zjiÅ¡Å¥ování %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Průchod stromem selhal" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Nelze otevřít %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr "Odlinkování %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Nemohu přečíst link %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Nemohu odlinkovat %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nezdařilo se slinkovat %s s %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Nemohu vyhodnotit %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archív nemá pole Package" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" @@@ -613,79 -629,79 +629,79 @@@ msgstr "Problém s odlinkováním %s msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ale není nainstalovaný" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " nebo" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -694,122 -710,144 +710,144 @@@ msgstr " "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalováno, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Opravuji závislosti..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " selhalo." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Nemohu opravit závislosti" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Nemohu minimalizovat sadu pro aktualizaci" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Hotovo" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Pro opravení můžete spustit `apt-get -f install'." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste použít -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Instalovat tyto balíky bez ověření [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly být autentizovány" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Vnitřní chyba při přidávání diverze" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potřebuji stáhnout %sB/%sB archívů.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potřebuji stáhnout %sB archívů.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení bude na disku použito dalších %sB.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Na %s nemáte dostatek volného místa" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatek volného místa." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno 'pouze triviální', ovÅ¡em toto není triviální operace." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -820,28 -858,28 +858,28 @@@ msgstr " "Pro pokračování opiÅ¡te frázi '%s'\n" " ?]" - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "PřeruÅ¡eno." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -849,47 -887,47 +887,47 @@@ msgstr " "Nemohu stáhnout některé archívy. Možná spusÅ¥te apt-get update nebo zkuste --" "fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Nemohu opravit chybějící balíky." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "PřeruÅ¡uji instalaci." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Pozn: Vybírám %s místo %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Přeskakuji %s, protože je již nainstalován.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s není nainstalován, nelze tedy odstranit\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuální balík poskytovaný:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "[Instalovaný]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Měli byste explicitně vybrat jeden k instalaci." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -900,49 -938,49 +938,49 @@@ msgstr " "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n" "pouze z jiného zdroje\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Nicméně následující balíky jej nahrazují:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta pro instalaci" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání '%s' pro '%s' nebylo nalezeno" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze '%s' pro '%s' nebyla nalezena" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -950,25 -988,25 +988,44 @@@ msgstr " "Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " "použity starší verze." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Následující informace vám mohou pomoci vyřeÅ¡it tuto situaci:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Vnitřní chyba, AllUpgrade pokazil věci" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit `apt-get -f install':" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -976,7 -1014,7 +1033,7 @@@ msgstr " "Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo " "navrhněte řeÅ¡ení)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -987,7 -1025,7 +1044,7 @@@ msgstr " "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky jeÅ¡tě nebyly vytvořeny nebo přesunuty z Příchozí fronty." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -997,114 -1035,124 +1054,120 @@@ msgstr " "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Následující informace vám mohou pomoci vyřeÅ¡it tuto situaci:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "PoÅ¡kozené balíky" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Následujcící extra balíky budou instalovány:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Navrhované balíky:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Doporučované balíky:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci..." - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Selhalo" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Hotovo" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Vnitřní chyba, AllUpgrade pokazil věci" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archívů.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archívů.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Stažení některých archívů selhalo." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Synovský proces selhal" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1113,31 -1161,31 +1176,31 @@@ msgstr " "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliÅ¡ nový" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Podporované moduly:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1440,8 -1488,8 +1503,9 @@@ msgstr "Přepsat vyhovující balík be msgid "File %s/%s overwrites the one in the package %s" msgstr "Soubor %s/%s přepisuje ten z balíku %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nemohu číst %s" @@@ -1471,9 -1519,9 +1535,9 @@@ msgid "The info and temp directories ne msgstr "Adresáře info a temp musí být na stejném souborovém systému" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Čtu seznamy balíků" @@@ -1580,12 -1628,12 +1644,12 @@@ msgstr "Nelze najít platný kontrolnà msgid "Unparsable control file" msgstr "Nezpracovatelný kontrolní soubor" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Nemohu číst databázi na cdrom %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1593,28 -1641,34 +1657,34 @@@ msgstr " "Pro přidání CD do APTu použijte apt-cdrom. apt-get update nelze využít pro " "přidávání nových CD." - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Chybné CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nemohu odpojit CD-ROM v %s - možná se stále používá." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Soubor nebyl nalezen" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Soubor nebyl nalezen" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Neplatné URI, lokální URI nesmí začínat na //" @@@ -1672,7 -1726,7 +1742,7 @@@ msgstr "Čas spojení vyprÅ¡el msgid "Server closed the connection" msgstr "Server uzavřel spojení" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba čtení" @@@ -1684,7 -1738,7 +1754,7 @@@ msgstr "Odpověď přeplnila buffer. msgid "Protocol corruption" msgstr "PoruÅ¡ení protokolu" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba zápisu" @@@ -1785,43 -1839,81 +1855,81 @@@ msgstr "Nemohu vytvořit socket pro %s msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nemohu navázat spojení na %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nemohu se připojit k %s:%s (%s), čas spojení vyprÅ¡el" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nemohu se připojit k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Připojuji se k %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Nemohu zjistit '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Dočasné selhání při zjiÅ¡Å¥ování '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Něco hodně oÅ¡klivého se přihodilo při zjiÅ¡Å¥ování '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nemohu se připojit k %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Nemohu získat zámek %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Následujcící extra balíky budou instalovány:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1905,10 -1997,6 +2013,6 @@@ msgstr "Spojení selhalo msgid "Internal error" msgstr "Vnitřní chyba" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Spojení bylo předčasně ukončeno" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Nemohu provést mmap prázdného souboru" @@@ -1923,58 -2011,58 +2027,58 @@@ msgstr "NeÅ¡lo mmapovat %lu bajtů msgid "Selection %s not found" msgstr "Výběr %s nenalezen" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nerozpoznaná zkratka typu: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Otevírám konfigurační soubor %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Řádek %d je příliÅ¡ dlouhý (max %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Zkomolená značka" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaktická chyba %s:%u: PříliÅ¡ mnoho vnořených propojení (include)" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí" @@@ -2040,7 -2128,7 +2144,7 @@@ msgstr "Neplatná operace %s msgid "Unable to stat the mount point %s" msgstr "Nelze vyhodnotit přípojný bod %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nemohu přejít do %s" @@@ -2049,70 -2137,70 +2153,70 @@@ msgid "Failed to stat the cdrom" msgstr "Nezdařilo se vyhodnotit cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "NeÅ¡lo otevřít zámkový soubor %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Nemohu získat zámek %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržel chybu segmentace." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Nemohu otevřít soubor %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále mám %lu k zápisu, ale nejde to" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problém při zavírání souboru" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Problém při odstraňování souboru" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@@ -2185,18 -2273,18 +2289,28 @@@ msgstr "volitelný msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Vytvářím strom závislostí" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandidátské verze" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generování závislostí" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Slučuji dostupné informace" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Selhal zápis do souboru %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2207,52 -2295,52 +2321,52 @@@ msgstr "Nelze zpracovat soubor %s (1) msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otevírám %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliÅ¡ dlouhý." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" @@@ -2273,13 -2361,13 +2387,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indexový typ souboru '%s' není podporován" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archív." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2287,36 -2375,49 +2401,49 @@@ msgstr " "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " "podrženými balíky." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Adresář seznamů %spartial chybí." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archivní adresář %spartial chybí." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ovladač metody %s nemohl být nalezen." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nebyla spuÅ¡těna správně" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Výměna média: Vložte disk nazvaný\n" + " '%s'\n" + "do mechaniky '%s' a stiskněte enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' není podporován" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" @@@ -2351,84 -2452,84 +2478,84 @@@ msgstr "Nerozumím vypíchnutí typu %s msgid "No priority (or zero) specified for pin" msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Cache má nekompatibilní systém správy verzí" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Při zpracování %s se objevila chyba (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Při zpracování %s se objevila chyba (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Při zpracování %s se objevila chyba (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Při zpracování %s se objevila chyba (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Při zpracování %s se objevila chyba (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Při zpracování %s se objevila chyba (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Wow, překročili jste počet jmen balíků, které tato APT zvládá zpracovat." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Wow, překročili jste počet závislostí, které tato APT zvládá zpracovat." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba při zpracování %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "NeÅ¡lo vyhodnotit seznam zdrojových balíků %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" @@@ -2437,11 -2538,11 +2564,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2450,7 -2551,7 +2577,7 @@@ msgstr " "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2459,14 -2560,14 +2586,14 @@@ msgstr " "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou naruÅ¡eny. Chybí pole Filename: u balíku %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@@ -2475,7 -2576,7 +2602,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobce %s neobsahuje otisk klíče" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2484,47 -2585,47 +2611,47 @@@ msgstr " "Používám přípojný bod %s\n" "Připojuji CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Rozpoznávám... " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Uložený název: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Používám přípojný bod %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Odpojuji CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Čekám na disk...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Připojuji CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Hledám na disku indexové soubory...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i) a podpisy (%i)\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Nejedná se o platné jméno, zkuste to znovu.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2533,19 -2634,19 +2660,19 @@@ msgstr " "Tento disk se nazývá: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kopíruji seznamy balíků..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Zapisuji nový seznam balíků\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Odpojuji CD-ROM..." @@@ -2569,3 -2670,57 +2696,57 @@@ msgstr "Zapsal jsem %i záznamů s neso msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Otevírám %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Otevírám %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Otevírám konfigurační soubor %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Připojuji se k %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instalovaná verze: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Otevírám %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Doporučuje" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Spojení bylo předčasně ukončeno" diff --combined po/da.po index 44cf0337a,3d5a009ff..01aee4f18 --- a/po/da.po +++ b/po/da.po @@@ -8,14 -8,14 +8,14 @@@ msgid " msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-11-07 15:28+0100\n" ++"POT-Creation-Date: 2005-11-16 17:15+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" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.2\n" +"X-Generator: KBabel 1.9.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: cmdline/apt-cache.cc:135 @@@ -152,8 -152,8 +152,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s oversat på %s %s\n" @@@ -232,6 -232,18 +232,18 @@@ msgstr " " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'" + + #: cmdline/apt-cdrom.cc:93 + msgid "Please insert a Disc in the drive and press enter" + msgstr "Indsæt en disk i drevet og tryk retur" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "Gentag processen for resten af cd'erne i dit sæt." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Parametre ikke angivet i par" @@@ -293,7 -305,7 +305,7 @@@ msgstr " " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@@ -302,31 -314,31 +314,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke finde debconfs version. Er debconf installeret?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Pakkeudvidelseslisten er for lang" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Fejl under behandling af mappen %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Kildeudvidelseslisten er for lang" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Fejl under skrivning af hovedet til indholdsfil" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Fejl under behandling af indhold %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -406,11 -418,11 +418,11 @@@ msgstr " " -c=? Læs denne opsætningsfil\n" " -o=? Sæt en opsætnings-indstilling" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Ingen valg passede" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Visse filer mangler i pakkefilgruppen '%s'" @@@ -443,83 -455,83 +455,83 @@@ msgstr "Arkivet har ingen kontrolindgan msgid "Unable to get a cursor" msgstr "Kunne skaffe en markør" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Kunne ikke læse mappen %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kunne ikke finde finde %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "F: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "A: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "F: Fejlene vedrører filen " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Kunne ikke omsætte navnet %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Trævandring mislykkedes" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Kunne ikke åbne %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Kunne ikke 'readlink' %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Kunne ikke frigøre %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Kunne ikke lænke %s til %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Nåede DeLink-begrænsningen på %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Kunne ikke finde %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" @@@ -619,80 -631,79 +631,80 @@@ msgstr "Problem under aflænkning af %s msgid "Failed to rename %s to %s" msgstr "Kunne ikke omdøbe %s til %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uopfyldte afhængigheder:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "men den kan ikke installeres" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "men den er ikke installeret" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " eller" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil blive installeret:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil blive AFINSTALLERET:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Følgende pakker er blevet holdt tilbage:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil blive opgraderet:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil blive NEDGRADERET:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Følgende tilbageholdte pakker vil blive ændret:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -700,123 -711,144 +712,144 @@@ msgstr " "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 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Retter afhængigheder..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " mislykkedes." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Kunne ikke rette afhængigheder" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Kunne ikke minimere opgraderingssættet" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Færdig" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhængigheder. Prøv med -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakkers autensitet kunne ikke verificeres!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Autentifikationsadvarsel tilsidesat.\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Installér disse pakker uden verifikation (y/N)? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "Intern fejl. Sortering blev ikke fuldført" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke læses." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB skal hentes fra arkiverne.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB skal hentes fra arkiverne.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter udpakning vil %sB yderligere diskplads være brugt.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "Kunne ikke bestemme ledig plads i %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikke nok ledig plads i %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, gør som jeg siger!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -826,28 -858,28 +859,28 @@@ msgstr " "For at fortsætte, skal du skrive '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Afbryder." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -855,49 -887,49 +888,49 @@@ msgstr " "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' " "eller prøv med --fix-missing." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understøttes endnu ikke" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Afbryder installationen." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Bemærk, at %s vælges fremfor %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Overspringer %s, da den allerede er installeret og opgradering er " "deaktiveret.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installeret]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Du bør eksplicit vælge en at installere." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -908,49 -940,49 +941,49 @@@ msgstr " "anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n" "kun kan hentes fra andre kilder\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Dog kan følgende pakker erstatte den:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installationskandidat" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven '%s' for '%s' blev ikke fundet" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen '%s' for '%s' blev ikke fundet" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Kunne ikke låse listemappen" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -958,25 -990,25 +991,44 @@@ msgstr " "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " "bruges i stedet." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Intern fejl. Problemløseren ødelagde noget" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade ødelagde noget" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -984,7 -1016,7 +1036,7 @@@ msgstr " "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv " "en løsning)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -995,7 -1027,7 +1047,7 @@@ msgstr " "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgængelige." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1004,105 -1036,114 +1056,110 @@@ msgstr " "Siden du kan bad om en enkelt handling, kan pakken højst sandsynligt slet\n" "ikke installeres og du bør indsende en fejlrapport for denne pakke." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Ødelagte pakker" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Foreslåede pakker:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Anbefalede pakker:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislykkedes" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Færdig" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "Intern fejl. Problemløseren ødelagde noget" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst én pakke at hente kildeteksten til" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Barneprocessen fejlede" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1110,7 -1151,7 +1167,7 @@@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1119,32 -1160,32 +1176,32 @@@ msgstr " "%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for " "ny" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Understøttede moduler:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1397,7 -1438,7 +1454,7 @@@ msgid "Duplicate conf file %s/%s msgstr "Dobbelt opsætningsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format +#, fuzzy, c-format msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" @@@ -1453,8 -1494,8 +1510,9 @@@ msgstr "Overskriv pakkematch uden versi msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overskriver filen i pakken %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke læse %s" @@@ -1484,9 -1525,9 +1542,9 @@@ msgid "The info and temp directories ne msgstr "Mapperne info og temp skal ligge i samme filsystem" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Indlæser pakkelisterne" @@@ -1544,7 -1585,6 +1602,7 @@@ msgid "Internal error adding a diversio msgstr "Intern fejl under tilføjelse af omrokering" #: apt-inst/deb/dpkgdb.cc:383 +#, fuzzy msgid "The pkg cache must be initialized first" msgstr "pkg-mellemlageret skal initialiseres først" @@@ -1595,12 -1635,12 +1653,12 @@@ msgstr "Kunne ikke finde en gyldig kont msgid "Unparsable control file" msgstr "Ikke-tolkbar kontrolfil" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Kunne ikke læse cdrom-databasen %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1608,28 -1648,33 +1666,34 @@@ msgstr " "Brug apt-cdrom for at apt kan lære den at kende. apt-get update kan ikke " "bruges til at tilføje nye cd'er" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Forkert cd" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Disk blev ikke fundet." ++msgstr "Fil blev ikke fundet" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fil blev ikke fundet" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kunne ikke finde" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig URI, lokale URI'er må ikke starte med //" @@@ -1687,7 -1732,7 +1751,7 @@@ msgstr "Tidsudløb på forbindelsen msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Læsefejl" @@@ -1699,7 -1744,7 +1763,7 @@@ msgstr "Mellemlageret blev overfyldt a msgid "Protocol corruption" msgstr "Protokolfejl" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefejl" @@@ -1800,43 -1845,82 +1864,81 @@@ msgstr "Kunne ikke oprette sokkel til % msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan ikke oprette forbindelse til %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudløb" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunne ikke forbinde til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Forbinder til %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Kunne ikke omsætte navnet '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig fejl ved omsætning af navnet '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Der skete noget underligt under navneomsætning af '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kunne ikke forbinde til %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter." ++msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Stødte på mindst én ugyldig signatur." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Kunne ikke køre " ++msgstr "Kunne ikke opnå låsen %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr " for at verificere signaturen (er gnupg installeret?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Ukendt fejl ved kørsel af gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Følgende signaturer var ugyldige:\n" ++msgstr "Følgende yderligere pakker vil blive installeret:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er " -"tilgængelig:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1921,10 -2005,6 +2023,6 @@@ msgstr "Forbindelsen mislykkedes msgid "Internal error" msgstr "Intern fejl" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Forbindelsen lukkedes for hurtigt" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Kan ikke udføre mmap for en tom fil" @@@ -1939,57 -2019,57 +2037,57 @@@ msgstr "Kunne ikke udføre mmap for %lu msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukendt type-forkortelse: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Åbner konfigurationsfilen %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Linjen %d er for lang (må højst være %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfejl %s:%u: Blokken starter uden navn." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfejl %s:%u: Forkert udformet mærke" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfejl %s:%u: Overskydende affald efter værdien" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfejl %s:%u: For mange sammenkædede inkluderinger" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfejl %s:%u: Inkluderet herfra" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen" @@@ -2055,7 -2135,7 +2153,7 @@@ msgstr "Ugyldig handling %s msgid "Unable to stat the mount point %s" msgstr "Kunne ikke finde monteringspunktet %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kunne ikke skifte til %s" @@@ -2064,70 -2144,70 +2162,70 @@@ msgid "Failed to stat the cdrom" msgstr "Kunne ikke finde cdrommen" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke åbne låsefilen %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benytter ikke låsning for nfs-monteret låsefil %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Kunne ikke opnå låsen %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede på %s, men den var der ikke" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke åbne filen %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "læs, mangler stadig at læse %lu men der er ikke flere" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skriv, mangler stadig at skrive %lu men kunne ikke" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problem under lukning af fil" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Fejl ved frigivelse af filen" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@@ -2200,18 -2280,18 +2298,28 @@@ msgstr "frivillig msgid "extra" msgstr "ekstra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Opbygger afhængighedstræ" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandidatversioner" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Afhængighedsgenerering" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Sammenfletter tilgængelighedsoplysninger" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Kunne ikke skrive filen %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2222,52 -2302,52 +2330,52 @@@ msgstr "Kunne ikke tolke pakkefilen %s msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Åbner %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" @@@ -2289,14 -2369,14 +2397,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indeksfiler af typen '%s' understøttes ikke" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2304,37 -2384,47 +2412,50 @@@ msgstr " "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " "tilbageholdte pakker." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listemappen %spartial mangler." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivmappen %spartial mangler." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Henter fil %li ud af %li (%s tilbage)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Metodedriveren %s blev ikke fundet." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startede ikke korrekt" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur." ++msgstr "" ++"Medieskift: Indsæt disken med navnet\n" ++" '%s'\n" ++"i drevet '%s' og tryk retur\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understøttes ikke" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" @@@ -2368,84 -2458,84 +2489,84 @@@ msgstr "Kunne ikke forstå pin-type %s msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Mellemlageret benytter en inkompatibel versionsstyring" --#: apt-pkg/pkgcachegen.cc:117 -#, c-format ++#: apt-pkg/pkgcachegen.cc:119 +#, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 -#, c-format ++#: apt-pkg/pkgcachegen.cc:131 +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 -#, c-format ++#: apt-pkg/pkgcachegen.cc:152 +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 -#, c-format ++#: apt-pkg/pkgcachegen.cc:156 +#, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 -#, c-format ++#: apt-pkg/pkgcachegen.cc:186 +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 -#, c-format ++#: apt-pkg/pkgcachegen.cc:190 +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 -#, c-format ++#: apt-pkg/pkgcachegen.cc:194 +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere." --#: apt-pkg/pkgcachegen.cc:241 -#, c-format ++#: apt-pkg/pkgcachegen.cc:243 +#, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 -#, c-format ++#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Samler filudbud" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" @@@ -2454,11 -2544,11 +2575,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "omdøbning mislykkedes, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2467,7 -2557,7 +2588,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:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2476,13 -2566,13 +2597,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:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, 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:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" @@@ -2491,7 -2581,7 +2612,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Leverandørblok %s inderholder intet fingeraftryk" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2500,47 -2590,47 +2621,47 @@@ msgstr " "Bruger cdrom-monteringspunktet %s\n" "Monterer cdrom\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identificerer.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Gemt mærkat: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruger cdrom-monteringspunktet %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Afmonterer cdrom\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Venter på disken...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Monterer cdrom...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Skanner disken for indeksfiler..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Fandt %i pakkeindekser, %i kildeindekser og %i signaturer\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldigt navn, prøv igen.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2549,19 -2639,19 +2670,19 @@@ msgstr " "Denne disk hedder: \n" " %s \n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kopierer pakkelisterne..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Afmonterer cdrom..." @@@ -2585,6 -2675,60 +2706,60 @@@ msgstr "Skrev %i poster med %i ikke-tru msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Klargør %s" ++msgstr "Åbner %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Pakker %s ud" ++msgstr "Åbner %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Gør klar til at sætte %s op" ++msgstr "Åbner konfigurationsfilen %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Sætter %s op" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "Installerede %s" ++msgstr " Installeret: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Gør klar til afinstallation af %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Fjerner %s" ++msgstr "Åbner %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "Fjernede %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Gør klar til at fjerne %s inklusive opsætning" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "Fjernede %s inklusive opsætning" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Forbindelsen lukkedes for hurtigt" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Ukendt leverandør-ID '%s' på linje %u i kildelisten %s" @@@ -2674,9 -2818,6 +2849,6 @@@ #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Kunne ikke omdøbe %s.new til %s" - #~ msgid "Please insert a Disc in the drive and press enter" - #~ msgstr "Indsæt en disk i drevet og tryk retur" - #~ msgid "I found (binary):" #~ msgstr "Jeg fandt (binære programfiler):" @@@ -2694,15 -2835,9 +2866,9 @@@ #~ msgstr "" #~ "Kunne ikke finde nogen pakkefiler. Det er muligvis ikke en Debiandisk" - #~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" - #~ msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'" - #~ msgid " '" #~ msgstr " '" - #~ msgid "Repeat this process for the rest of the CDs in your set." - #~ msgstr "Gentag processen for resten af cd'erne i dit sæt." - #~ msgid "" #~ "Usage: apt-cdrom [options] command\n" #~ "\n" @@@ -2749,22 -2884,6 +2915,6 @@@ #~ msgid "Internal error, non-zero counts" #~ msgstr "Intern fejl. ikke-nul optælling" - #~ msgid "Internal error, InstallPackages was called with broken packages!" - #~ msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" - - #~ msgid "Internal error, Ordering didn't finish" - #~ msgstr "Intern fejl. Sortering blev ikke fuldført" - - #~ msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" - #~ msgstr "" - #~ "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org" - - #~ msgid "Couldn't determine free space in %s" - #~ msgstr "Kunne ikke bestemme ledig plads i %s" - - #~ msgid "Internal error, problem resolver broke stuff" - #~ msgstr "Intern fejl. Problemløseren ødelagde noget" - #~ msgid "Couldn't wait for subprocess" #~ msgstr "Kunne ikke vente på underproces" diff --combined po/de.po index e053fee1e,23f79dfe3..0fd07d894 --- a/po/de.po +++ b/po/de.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s für %s %s kompiliert am %s %s\n" @@@ -228,6 -228,21 +228,21 @@@ msgstr " "tmp\n" "Siehe auch apt-cache(8) und apt.conf(5) für weitere Informationen.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 " + "Disk 1«" + + #: cmdline/apt-cdrom.cc:93 + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumente nicht paarweise" @@@ -293,7 -308,7 +308,7 @@@ msgstr " " -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" "tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Kann nicht nach %s schreiben" @@@ -302,31 -317,31 +317,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kann debconf-Version nicht ermitteln. Ist debconf installiert?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" 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 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Fehler beim Verarbeiten von Verzeichnis %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Quellerweiterungsliste ist zu lang" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Fehler beim Schreiben des Headers in die Inhaltsdatei" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Fehler beim Verarbeiten der Inhaltsdatei %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -414,11 -429,11 +429,11 @@@ msgstr " " -c=? Lese diese Konfigurationsdatei\n" " -o=? Setze eine beliebige Konfigurations-Option" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Keine Auswahl passt" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«" @@@ -451,83 -466,83 +466,83 @@@ msgstr "Archiv ist keinen Steuerungs-Da msgid "Unable to get a cursor" msgstr "Kann keinen Cursor bekommen" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kann Verzeichnis %s nicht lesen\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kann nicht zugreifen auf %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "F: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "F: Fehler gehören zu Datei " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Konnte %s nicht auflösen" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Baumabschreiten fehlgeschlagen" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Konnte %s nicht öffnen" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Kann kein readlink auf %s durchführen" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Konnte %s entfernen (unlink)" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Konnte keine Verknüpfung von %s zu %s anlegen" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-Limit von %sB erreicht.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Kann auf %s nicht zugreifen." - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archiv hatte kein Paket-Feld" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Maintainer ist %s und nicht %s\n" @@@ -627,79 -642,79 +642,79 @@@ msgstr "Problem beim Unlinking von %s msgid "Failed to rename %s to %s" msgstr "Konnte %s nicht in %s umbenennen" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ist aber nicht installierbar" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ist aber nicht installiert" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " oder " --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Die folgenden Pakete werden DEAKTUALISIERT:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Die folgenden gehaltenen Pakete werden verändert:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -708,124 -723,147 +723,147 @@@ msgstr " "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu deaktualisiert, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Abhängigkeit werden korrigiert..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " fehlgeschlagen." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Kann Abhängigkeiten nicht korrigieren" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Fertig" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu " "korrigieren." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " -msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? " +msgstr "Diese Pakete ohne Überprüfung installieren [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "Interner Fehler, Anordnung beendete nicht" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + "Wie merkwürdig... Die Größen haben nicht übereingestimmt, schreiben Sie an " + "apt@packages.debian.org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es müssen %sB Archive geholt werden.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "Konnte freien Platz in %s nicht bestimmen" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Nur triviale« angegeben, aber das ist keine triviale Operation." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, tu was ich sage!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -836,28 -874,28 +874,28 @@@ msgstr " "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abbruch." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -865,48 -903,48 +903,48 @@@ msgstr " "Konnte einige Archive nicht herunterladen, vielleicht »apt-get update« oder " "mit »--fix-missing« probieren?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Konnte fehlende Pakete nicht korrigieren." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Installation abgebrochen." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Achtung, wähle %s an Stelle von %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakete %s ist ein virtuelles Pakete, das bereitgestellt wird von:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installiert]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswählen." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -917,51 -955,51 +955,51 @@@ msgstr " "Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n" "ist oder nur aus einer anderen Quelle verfügbar ist.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s hat keinen Installationskandidaten" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Re-Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release »%s« für »%s« konnte nicht gefunden werden" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« für »%s« konnte nicht gefunden werden" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Der Befehl »update« nimmt keine Argumente" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -969,27 -1007,27 +1007,47 @@@ msgstr " "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " "ignoriert oder alte an ihrer Stelle benutzt." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "" ++"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Achtung, wähle %s für reg. Ausdruck »%s«\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu " "korrigieren:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -997,7 -1035,7 +1055,7 @@@ msgstr " "Nichterfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne " "jeglich Pakete (oder geben Sie eine Lösung an)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1009,7 -1047,7 +1067,7 @@@ msgstr " "instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1020,110 -1058,119 +1078,114 @@@ msgstr " "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "" --"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Kaputte Pakete" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fehlgeschlagen" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Fertig" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB der Quellarchive geholt werden.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n" "überprüft werden sollen." - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden." - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1132,7 -1179,7 +1194,7 @@@ msgstr " "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1141,32 -1188,32 +1203,32 @@@ msgstr " "%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare " "Version von Paket %s die Versionsanforderungen erfüllen kann." - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist " "zu neu." - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Unterstützte Module:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1479,8 -1526,8 +1541,9 @@@ msgstr "Überschreibe Paket-Treffer ohn msgid "File %s/%s overwrites the one in the package %s" msgstr "Datei %s/%s überschreibt die Datei in Paket %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kann %s nicht lesen" @@@ -1511,9 -1558,9 +1574,9 @@@ msgstr " "Die »info«- und »temp«-Verzeichnisse müssen im selben Dateisystem liegen" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" @@@ -1621,12 -1668,12 +1684,12 @@@ msgstr "Konnte gültige Kontroll-Datei msgid "Unparsable control file" msgstr "Unparsbare Kontroll-Datei" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Kann CD-ROM-Datenbank %s nicht lesen" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1634,31 -1681,37 +1697,37 @@@ msgstr " "Bitte verwenden Sie apt-cdrom, um diese CD von APT erkennbar zu machen - apt-" "get update kann nicht dazu verwendet werden, neue CDs hinzuzufügen" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Falsche CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Kann Einbindung von CD-ROM in %s nicht lösen, möglicherweise wird sie noch " "verwendet." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Datei nicht gefunden" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kann nicht zugreifen." - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Kann Änderungszeitpunkt nicht setzen" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Ungültige URI, lokale URIs dürfen nicht mit // anfangen" @@@ -1716,7 -1769,7 +1785,7 @@@ msgstr "Zeitüberschreitung der Verbind msgid "Server closed the connection" msgstr "Der Server hat die Verbindung geschlossen" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefehler" @@@ -1728,7 -1781,7 +1797,7 @@@ msgstr "Eine Antwort hat einen Puffer z msgid "Protocol corruption" msgstr "Protokollkorrumption" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Schreibfehler" @@@ -1830,44 -1883,82 +1899,82 @@@ msgstr "Kann keinen Verbindungsendpunk msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kann keine Verbindung mit %s:%s aufbauen (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Konnte wegen Zeitüberschreitung keine Verbindung mit %s:%s aufbauen (%s)" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Konnte nicht mit %s:%s verbinden (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Verbinde mit %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Konnte »%s« nicht auflösen" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporärer Fehlschlag beim Auflösen von »%s«" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kann nicht mit %s:%s verbinden:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Konnte Lock %s nicht bekommen" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Die folgenden zusätzlichen Pakete werden installiert:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1953,10 -2044,6 +2060,6 @@@ msgstr "Verbindung fehlgeschlagen msgid "Internal error" msgstr "Interner Fehler" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Verbindung zu früh beendet" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Kann eine leere Datei nicht mit mmap abbilden" @@@ -1971,58 -2058,58 +2074,58 @@@ msgstr "Konnte kein mmap von %lu Bytes msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nicht erkannte Typabkürzung: »%c«" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Öffne Konfigurationsdatei %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Zeile %d zu lang (maximal %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfehler %s:%u: Block fängt ohne Namen an." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll nach Wert" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (include)" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfehler %s:%u: Einbindung von here" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende" @@@ -2088,7 -2175,7 +2191,7 @@@ msgstr "Ungültige Operation %s. msgid "Unable to stat the mount point %s" msgstr "Kann auf den Einhängepunkt %s nicht zugreifen." - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kann nicht nach %s wechseln" @@@ -2097,70 -2184,70 +2200,70 @@@ msgid "Failed to stat the cdrom" msgstr "Konnte auf CD-ROM nicht zugreifen" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benutze kein Locking für Nur-Lese-Lockdatei %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Konnte Lockdatei %s nicht öffnen" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benutze kein Locking für NFS-eingebundene Lockdatei %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Konnte Lock %s nicht bekommen" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Auf %s gewartet, aber es war nicht da" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozess %s ist mit einem Fehlercode zurückgekehrt (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s hat sich unerwartet beendet" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Konnte Datei %s nicht öffnen" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "Lesen, habe noch %lu zu lesen aber nichts mehr da" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "Schreiben, habe noch %lu zu schreiben, konnte aber nicht" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Beim Schließen der Datei trat ein Problem auf" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Beim Unlinking Datei trat ein Problem auf" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Beim Synchronisieren einer Datei trat ein Problem auf" @@@ -2233,18 -2320,18 +2336,28 @@@ msgstr "optional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Abhängigkeitsbaum wird aufgebaut" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Mögliche Versionen" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Abhängigkeits-Generierung" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Führe Information zur Verfügbarkeit zusammen" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Konnte nicht in Datei %s schreiben" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2255,52 -2342,52 +2368,52 @@@ msgstr "Kann Paketdatei %s nicht parse msgid "Unable to parse package file %s (2)" msgstr "Kann Paketdatei %s nicht parsen (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in der Quellliste %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %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" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" @@@ -2322,7 -2409,7 +2435,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indexdateityp »%s« wird nicht unterstützt" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2330,7 -2417,7 +2443,7 @@@ msgstr " "Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür " "finden." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2338,36 -2425,49 +2451,49 @@@ msgstr " "Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies " "könnte durch gehaltene Pakete hervorgerufen worden sein." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listenverzeichnis %spartial fehlt." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archivverzeichnis %spartial fehlt." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Der Treiber für Methode %s konnte nicht gefunden werden." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Methode %s hat nicht korrekt gestartet" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Medienwechsel: Bitte legen Sie Medium mit den Name\n" + " »%s«\n" + "in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketierungssystem »%s« wird nicht unterstützt" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" @@@ -2406,88 -2506,88 +2532,88 @@@ msgstr "Konnte Stecknadeltyp (»pin typ msgid "No priority (or zero) specified for pin" msgstr "Keine Priorität (oder Null) für Pin angegeben" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Dieser Paketcache wurde für ein inkompatibles Versionssystem aufgebaut" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Paketen überschritten, die APT handhaben kann." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben " "kann." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Abhängigkeiten überschritten, die APT " "handhaben kann." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen." --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Sammle Datei-Empfehlungen ein" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Sichern des Quellcaches" @@@ -2496,11 -2596,11 +2622,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2509,7 -2609,7 +2635,7 @@@ msgstr " "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2518,14 -2618,14 +2644,14 @@@ msgstr " "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@@ -2534,7 -2634,7 +2660,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Herstellerblock %s enthält keinen Fingerabdruck" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2543,47 -2643,47 +2669,47 @@@ msgstr " "Benutze CD-ROM-Einhängpunkt %s\n" "Hänge CD ein\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identifiziere... " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Gespeicherte Kennzeichnung: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Benutze CD-ROM-Einhängpunkt %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Hänge CD-ROM aus\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Warte auf CD...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Hänge CD-ROM ein...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Suche auf CD nach Index-Dateien...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Fand %i Paketindexe, %i Quellenindexe und %i Signaturen\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2592,19 -2692,19 +2718,19 @@@ msgstr " "Diese CD heißt jetzt: \n" "»%s«\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kopiere Paketlisten..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Schreibe neue Quellliste\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für diese CD sind:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Hänge CD-ROM aus..." @@@ -2630,6 -2730,60 +2756,60 @@@ msgstr " "Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien " "geschrieben.\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "%s wird geöffnet" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s wird geöffnet" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Öffne Konfigurationsdatei %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Verbinde mit %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Installiert:" + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "%s wird geöffnet" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Empfiehlt" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Verbindung zu früh beendet" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s" @@@ -2722,10 -2876,6 +2902,6 @@@ #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Konnte %s.new nicht in %s umbenennen" - #~ msgid "Please insert a Disc in the drive and press enter" - #~ msgstr "" - #~ "Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste" - #~ msgid "I found (binary):" #~ msgstr "Habe gefunden (binär):" @@@ -2743,18 -2893,9 +2919,9 @@@ #~ msgstr "" #~ "Konnte keine Paket-Dateien finden - vielleicht ist dies keine Debian-CD" - #~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" - #~ msgstr "" - #~ "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 " - #~ "Disk 1«" - #~ msgid " '" #~ msgstr " »" - #~ msgid "Repeat this process for the rest of the CDs in your set." - #~ msgstr "" - #~ "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe." - #~ msgid "" #~ "Usage: apt-cdrom [options] command\n" #~ "\n" @@@ -2804,23 -2945,6 +2971,6 @@@ #~ msgid "Internal error, non-zero counts" #~ msgstr "Interner Fehler, Zähler nicht Null" - #~ msgid "Internal error, InstallPackages was called with broken packages!" - #~ msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!" - - #~ msgid "Internal error, Ordering didn't finish" - #~ msgstr "Interner Fehler, Anordnung beendete nicht" - - #~ msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" - #~ msgstr "" - #~ "Wie merkwürdig... Die Größen haben nicht übereingestimmt, schreiben Sie " - #~ "an apt@packages.debian.org" - - #~ msgid "Couldn't determine free space in %s" - #~ msgstr "Konnte freien Platz in %s nicht bestimmen" - - #~ msgid "Internal error, problem resolver broke stuff" - #~ msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" - #~ msgid "Couldn't wait for subprocess" #~ msgstr "Konnte nicht auf Unterprozess warten" diff --combined po/el.po index 4a0cfe84d,e10c02d95..5f044fd48 --- a/po/el.po +++ b/po/el.po @@@ -16,7 -16,7 +16,7 @@@ msgid " msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-07-14 14:25EEST\n" "Last-Translator: Greek Translation Team \n" @@@ -160,8 -160,8 +160,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n" @@@ -241,6 -241,22 +241,22 @@@ msgstr " " -o=? Χρήση μιας αυθαίρετη επιλογής ρυθμίσεων, πχ -o dir::cache=/tmp\n" "Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πληροφορίες.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Αλλαγή Μέσου: Παρακαλώ εισάγετε το δίσκο με ετικέτα\n" + " '%s'\n" + "στη συσκευή '%s' και πιέστε enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Τα ορίσματα δεν είναι σε ζεύγη" @@@ -303,7 -319,7 +319,7 @@@ msgstr " " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" @@@ -312,31 -328,31 +328,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Σφάλμα επεξεργασίας του καταλόγου %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -420,11 -436,11 +436,11 @@@ msgstr " " -c=? Χρήση αυτού του αρχείου ρυθμίσεων\n" " -o=? Ορισμός αυθαίρετης επιλογής ρύθμισης" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Δεν ταιριαξε καμία επιλογή" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'" @@@ -457,83 -473,83 +473,83 @@@ msgstr "Η αρχειοθήκη δεν msgid "Unable to get a cursor" msgstr "Αδύνατη η πρόσβαση σε δείκτη" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Σφάλματα στο αρχείο" - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Αδύνατη η εύρεση του %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Αποτυχία ανεύρεσης" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Αποτυχία ανοίγματος του %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr "Αποσύνδεση %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Αποτυχία ανάγνωσης του %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Αποτυχία αποσύνδεσης του %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr " Αποτυχία σύνδεσης του %s με το %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Αποσύνδεση ορίου του %sB hit.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Αποτυχία εύρεσης της κατάστασης του %s." - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" @@@ -633,79 -649,79 +649,79 @@@ msgstr "Πρόβλημα κατά τηΠmsgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " η" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -714,125 -730,147 +730,147 @@@ msgstr " "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Διόρθωση εξαρτήσεων..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " απέτυχε." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Αδύνατη η διόρθωση των εξαρτήσεων" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Ετοιμο" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα " "προβλήματα." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -843,28 -881,28 +881,28 @@@ msgstr " "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Εγκατάλειψη." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -872,49 -910,49 +910,49 @@@ msgstr " "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update " "ή το --fix-missing;" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Αδύνατη η επίλυση των χαμένων πακέτων." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Εγκατεστημένα]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -926,51 -964,51 +964,51 @@@ msgstr " "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο " "από άλλη πηγή\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή " "του\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκδοση %s για το%s δεν βρέθηκε" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -978,25 -1016,25 +1016,44 @@@ msgstr " "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " "στη θέση τους." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1004,7 -1042,7 +1061,7 @@@ msgstr " "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1016,7 -1054,7 +1073,7 @@@ msgstr " "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1026,108 -1064,118 +1083,114 @@@ msgstr " "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n" "αναφορά σφάλματος για αυτό το πακέτο." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Απέτυχε" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Ετοιμο" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1135,7 -1183,7 +1198,7 @@@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1144,32 -1192,32 +1207,32 @@@ msgstr " "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1478,8 -1526,8 +1541,9 @@@ msgstr "Αντικατάσταση πα msgid "File %s/%s overwrites the one in the package %s" msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Αδύνατη η ανάγνωση του %s" @@@ -1509,9 -1557,9 +1573,9 @@@ msgid "The info and temp directories ne msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Ανάγνωση Λιστών Πακέτων" @@@ -1619,12 -1667,12 +1683,12 @@@ msgstr "Αποτυχία εντοπισ msgid "Unparsable control file" msgstr "Μη αναλύσιμο αρχείο control" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Αδύνατη η ανάγνωση της βάσης δεδομένων του cdrom %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1632,28 -1680,34 +1696,34 @@@ msgstr " "Παρακαλώ χρησιμοποιείστε το apt-cdrom για να αναγνωριστεί αυτό το CD από το " "APT. Το apt-get update δε χρησιμεύει για να προσθέτει νέα CD" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Λάθος CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μπορεί να είναι σε χρήση." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Το αρχείο Δε Βρέθηκε" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Μη έγκυρο URI, τα τοπικά URI δεν πρέπει να αρχίζουν με //" @@@ -1711,7 -1765,7 +1781,7 @@@ msgstr "Λήξη χρόνου σύνδΠmsgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" @@@ -1723,7 -1777,7 +1793,7 @@@ msgstr "Το μήνυμα Î±Ï€Î¬Î½Ï„Î·Ï msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Σφάλμα εγγραφής" @@@ -1824,43 -1878,81 +1894,81 @@@ msgstr "Αδύνατη η Î´Î·Î¼Î¹Î¿Ï…Ï msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Αδύνατη η εύρεση του '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Αδύνατο το κλείδωμα %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1945,10 -2037,6 +2053,6 @@@ msgstr "Η σύνδεση απέτυχΠmsgid "Internal error" msgstr "Εσωτερικό Σφάλμα" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Η σύνδεση έκλεισε πρόωρα" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Αδύνατο η απεικόνιση mmap ενός άδειου αρχείου" @@@ -1963,58 -2051,58 +2067,58 @@@ msgstr "Αδύνατη η απεικόΠmsgid "Selection %s not found" msgstr "Η επιλογή %s δε βρέθηκε" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Η γραμμή %d έχει υπερβολικό μήκος (μέγιστο %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου" @@@ -2081,7 -2169,7 +2185,7 @@@ msgstr "Μη έγκυρη Î»ÎµÎ¹Ï„Î¿Ï…Ï msgid "Unable to stat the mount point %s" msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Αδύνατη η αλλαγή σε %s" @@@ -2090,73 -2178,73 +2194,73 @@@ msgid "Failed to stat the cdrom" msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " "%s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Αδύνατο το κλείδωμα %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@@ -2229,18 -2317,18 +2333,28 @@@ msgstr "προαιρετικό msgid "extra" msgstr "επιπλέον" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Κατασκευή Δένδρου Εξαρτήσεων" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Υποψήφιες Εκδόσεις" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Παραγωγή Εξαρτήσεων" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Αποτυχία εγγραφής στο αρχείο %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2251,52 -2339,52 +2365,52 @@@ msgstr "Αδύνατη η ανάλυσΠmsgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)" @@@ -2318,7 -2406,7 +2432,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2326,7 -2414,7 +2440,7 @@@ msgstr " "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " "κάποιας κατάλληλης αρχείοθήκης." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2334,36 -2422,49 +2448,49 @@@ msgstr " "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " "προκλήθηκε από κρατούμενα πακέτα." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Ο φάκελος λιστών %spartial αγνοείται." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Αλλαγή Μέσου: Παρακαλώ εισάγετε το δίσκο με ετικέτα\n" + " '%s'\n" + "στη συσκευή '%s' και πιέστε enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων" @@@ -2400,85 -2501,85 +2527,85 @@@ msgid "No priority (or zero) specified msgstr "" "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το " "APT." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Σφάλμα κατά την επεξεργασία του %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" @@@ -2487,11 -2588,11 +2614,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2500,7 -2601,7 +2627,7 @@@ msgstr " "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2509,7 -2610,7 +2636,7 @@@ msgstr " "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2517,7 -2618,7 +2644,7 @@@ msgstr " "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@@ -2526,7 -2627,7 +2653,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2535,47 -2636,47 +2662,47 @@@ msgstr " "Χρησιμοποιείται το σημείο προσάρτησης %s\n" "Προσαρτάται το CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Αναγνώριση..." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Αποθήκευση Ετικέτας: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Αποπροσάρτηση του CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Αναμονή για δίσκο...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Προσάρτηση του CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Σάρωση του δίσκου για περιεχόμενα...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Βρέθηκαν %i κατάλογοι πακέτων, %i κατάλογοι πηγαίων και %i υπογραφές\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2584,19 -2685,19 +2711,19 @@@ msgstr " "Ο δίσκος αυτός ονομάζεται: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Αντιγραφή λιστών πακέτων..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Eγγραφή νέας λίστας πηγών\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Αποπροσάρτηση του CD-ROM..." @@@ -2619,3 -2720,57 +2746,57 @@@ msgstr "Εγιναν %i ÎµÎ³Î³ÏÎ±Ï†Î­Ï #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Άνοιγμα του %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Άνοιγμα του %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Σύνδεση στο %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Εγκατεστημένα: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Άνοιγμα του %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Συστήνει" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Η σύνδεση έκλεισε πρόωρα" diff --combined po/en_GB.po index 574a296d3,a0d593d31..59a6099bf --- a/po/en_GB.po +++ b/po/en_GB.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: en_GB \n" @@@ -146,8 -146,8 +146,8 @@@ msgid " %4i %s\n msgstr "" #: 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@@ -191,6 -191,22 +191,22 @@@ msgid " "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "Please provide a name for this Disc, such as ‘Debian 2.1r1 Disk 1’" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Media Change: Please insert the disc labelled\n" + " ‘%s’\n" + "in the drive ‘%s’ and press enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "" @@@ -230,7 -246,7 +246,7 @@@ msgid " " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "" @@@ -239,33 -255,33 +255,33 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 #, fuzzy msgid "Package extension list is too long" msgstr "Option ‘%s’ is too long" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 #, fuzzy msgid "Source extension list is too long" msgstr "Option ‘%s’ is too long" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -345,11 -361,11 +361,11 @@@ msgstr " " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Some files are missing in the package file group ‘%s’" @@@ -382,83 -398,83 +398,83 @@@ msgstr " msgid "Unable to get a cursor" msgstr "" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "" - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "" - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "" - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, fuzzy, c-format msgid "Failed to resolve %s" msgstr "Could not resolve ‘%s’" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr "" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr "" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" @@@ -558,200 -574,221 +574,221 @@@ msgstr " msgid "Failed to rename %s to %s" msgstr "" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr "" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "" --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "" --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "" --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "" --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr "" --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr "" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "" --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "" --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -762,74 -799,74 +799,74 @@@ msgstr " "To continue type in the phrase ‘%s’\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "" - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "" - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, fuzzy, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, selecting %s for regex ‘%s’\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -837,73 -874,73 +874,91 @@@ "is only available from another source\n" msgstr "" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1429 ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run ‘apt-get -f install’ to correct these:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -911,7 -948,7 +966,7 @@@ msgstr " "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -919,149 -956,158 +974,154 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" "that package should be filed." msgstr "" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1317,8 -1363,8 +1377,9 @@@ msgstr " msgid "File %s/%s overwrites the one in the package %s" msgstr "" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@@ -1348,9 -1394,9 +1409,9 @@@ msgid "The info and temp directories ne msgstr "" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "" @@@ -1457,39 -1503,44 +1518,44 @@@ msgstr " msgid "Unparsable control file" msgstr "" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + msgid "Disk not found." + msgstr "" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "" @@@ -1545,7 -1596,7 +1611,7 @@@ msgstr " msgid "Server closed the connection" msgstr "" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "" @@@ -1557,7 -1608,7 +1623,7 @@@ msgstr " msgid "Protocol corruption" msgstr "" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "" @@@ -1658,43 -1709,80 +1724,80 @@@ msgstr " msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Could not resolve ‘%s’" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporary failure resolving ‘%s’" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Something wicked happened resolving ‘%s:%s’ (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Could not resolve ‘%s’" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + msgid "The following signatures were invalid:\n" + msgstr "" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1778,10 -1866,6 +1881,6 @@@ msgstr " msgid "Internal error" msgstr "" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "" @@@ -1796,57 -1880,57 +1895,57 @@@ msgstr " msgid "Selection %s not found" msgstr "" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Unrecognized type abbreviation: ‘%c’" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@@ -1912,7 -1996,7 +2011,7 @@@ msgstr " msgid "Unable to stat the mount point %s" msgstr "" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@@ -1921,70 -2005,70 +2020,70 @@@ msgid "Failed to stat the cdrom" msgstr "" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "" @@@ -2057,18 -2141,18 +2156,27 @@@ msgstr " msgid "extra" msgstr "" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++msgid "Reading state information" ++msgstr "" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Could not resolve ‘%s’" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2079,52 -2163,52 +2187,52 @@@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" --#: apt-pkg/sourcelist.cc:191 ++#: apt-pkg/sourcelist.cc:244 #, fuzzy, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Type ‘%s’ is not known in on line %u in source list %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@@ -2142,48 -2226,61 +2250,61 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Index file type ‘%s’ is not supported" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "" - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "" - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "" - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Media Change: Please insert the disc labelled\n" + " ‘%s’\n" + "in the drive ‘%s’ and press enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2217,82 -2314,82 +2338,82 @@@ msgstr " msgid "No priority (or zero) specified for pin" msgstr "" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "" @@@ -2301,31 -2398,31 +2422,31 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" @@@ -2334,73 -2431,73 +2455,73 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "" - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "" - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "" @@@ -2424,6 -2521,60 +2545,60 @@@ msgstr " msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" + #: apt-pkg/deb/dpkgpm.cc:358 + #, c-format + msgid "Preparing %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, c-format + msgid "Unpacking %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, c-format + msgid "Preparing to configure %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, c-format + msgid "Installed %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, c-format + msgid "Removing %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s" @@@ -2445,9 -2596,6 +2620,6 @@@ #~ msgid "-> '" #~ msgstr "-> ‘" - #~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" - #~ msgstr "Please provide a name for this Disc, such as ‘Debian 2.1r1 Disk 1’" - #~ msgid " '" #~ msgstr " ‘" diff --combined po/es.po index e046e15c2,89233647c..675264846 --- a/po/es.po +++ b/po/es.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.24\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-08 20:36+0100\n" "Last-Translator: Rubén Porras Campo \n" "Language-Team: Spanish \n" @@@ -150,8 -150,8 +150,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 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 en %s %s\n" @@@ -232,6 -232,19 +232,19 @@@ msgstr " "cache=/tmp\n" "Vea las páginas del manual apt-cache(8) y apt.conf(5) para más información.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + "Por favor provea un nombre para este disco, como 'Debian 2.1r1 Disco 1'" + + #: cmdline/apt-cdrom.cc:93 + msgid "Please insert a Disc in the drive and press enter" + msgstr "Por favor inserte un disco en la unidad y presione Intro" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "Repita este proceso para el resto de los CDs del conjunto." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumentos no emparejados" @@@ -295,7 -308,7 +308,7 @@@ msgstr " " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::" "cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" @@@ -304,31 -317,31 +317,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "La lista de extensión de paquetes es demasiado larga" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Error procesando el directorio %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "La lista de extensión de fuentes es demasiado larga" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Error escribiendo cabeceras de archivos de contenido" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Error procesando contenidos %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -414,11 -427,11 +427,11 @@@ msgstr " " -c=? Lee este archivo de configuración\n" " -o=? Establece una opción de configuración arbitraria" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Ninguna selección coincide" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltan algunos archivos en el grupo de archivo de paquetes `%s'" @@@ -451,83 -464,83 +464,83 @@@ msgstr "No hay registro de control del msgid "Unable to get a cursor" msgstr "No se pudo obtener un cursor" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No se pudo leer directorio %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No se pudo leer %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "A: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Errores aplicables al archivo '" - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "No se pudo resolver %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Falló el recorrido por el árbol." - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "No se pudo abrir %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "No se pudo leer el enlace %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "No se pudo desligar %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No pude enlazar %s con %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al límite de %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "No pude leer %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" @@@ -627,79 -640,79 +640,79 @@@ msgstr "Hay problemas desligando %s msgid "Failed to rename %s to %s" msgstr "Falló el renombre de %s a %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "pero no es instalable" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "pero no está instalado" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " o" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -708,123 -721,146 +721,146 @@@ msgstr " "AVISO: Se van a eliminar los siguientes paquetes esenciales\n" "¡Esto NO debe hacerse a menos que sepa exactamente lo que está haciendo!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Corrigiendo dependencias..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " falló." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "No se puede corregir las dependencias" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "No se puede minimizar el conjunto de actualización" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Listo" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "¿Instalar estos paquetes sin verificación [s/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utilizó -y sin --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "Error interno, InstallPackages fue llamado con un paquete roto!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Los paquetes necesitan eliminarse pero Remove está deshabilitado." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "Error interno, no terminó el ordenamiento" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + "Que raro.. Los tamaños no concuerdan, mande un correo a \n" + "apt@packages.debian.org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Se necesita descargar %sB/%sB de archivos.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Necesito descargar %sB de archivos.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Se utilizarán %sB de espacio de disco adicional después de desempaquetar.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Se liberarán %sB después de desempaquetar.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "No pude determinar el espacio libre en %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especificó Trivial Only pero ésta no es una operación trivial." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Sí, ¡haga lo que le digo!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -835,28 -871,28 +871,28 @@@ msgstr " "Para continuar escriba la frase '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abortado." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -864,47 -900,47 +900,47 @@@ msgstr " "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar\n" "apt-get update o deba intentarlo de nuevo con --fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no están soportados --fix-missing e intercambio de medio" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Abortando la instalación." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s en lugar de %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s no esta instalado, no se eliminará\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s es un paquete virtual provisto por:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instalado]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Necesita seleccionar explícitamente uno para instalar." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -915,49 -951,49 +951,49 @@@ msgstr " "a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n" "encuentra disponible desde alguna otra fuente\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Sin embargo, los siguientes paquetes lo reemplazan:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s no tiene candidato para su instalación" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ya está en su versión más reciente.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontró la Distribución '%s' para '%s'" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontró la versión '%s' para '%s'" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versión seleccionada %s (%s) para %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "El comando de actualización no toma argumentos" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -965,25 -1001,25 +1001,46 @@@ msgstr " "Algunos archivos de índice no se han podido descargar, se han ignorado,\n" "o se ha utilizado unos antiguos en su lugar." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "La siguiente información puede ayudar a resolver la situación:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "" ++"Error interno, el sistema de solución de problemas rompió\n" ++"algunas cosas" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompió cosas" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresión regular '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -991,7 -1027,7 +1048,7 @@@ msgstr " "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solución)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1003,7 -1039,7 +1060,7 @@@ msgstr " "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1013,107 -1049,118 +1070,114 @@@ msgstr " "paquete simplemente no sea instalable y debería de rellenar un informe de\n" "error contra ese paquete." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "La siguiente información puede ayudar a resolver la situación:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Paquetes rotos" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Paquetes recomendados" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falló" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Listo" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + msgid "Internal error, problem resolver broke stuff" + msgstr "" + "Error interno, el sistema de solución de problemas rompió\n" + "algunas cosas" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su código fuente" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento '%s'.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción '%s'.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Falló el proceso hijo" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construcción" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener información de dependencias de construcción para %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1122,7 -1169,7 +1186,7 @@@ msgstr " "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1131,32 -1178,32 +1195,32 @@@ msgstr " "La dependencia %s en %s no puede satisfacerse porque ninguna versión\n" "disponible del paquete %s satisface los requisitos de versión" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construcción de %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Módulos soportados:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1469,8 -1516,8 +1533,9 @@@ msgstr "Sobreescribiendo concordancia d msgid "File %s/%s overwrites the one in the package %s" msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" @@@ -1501,9 -1548,9 +1566,9 @@@ msgstr " "Los directorios info y temp deben de estar en el mismo sistema de archivos" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Leyendo lista de paquetes" @@@ -1610,12 -1657,12 +1675,12 @@@ msgstr "No pude localizar un archivo d msgid "Unparsable control file" msgstr "Archivo de control inanalizable" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "No pude leer la base de datos %s del cdrom" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1623,28 -1670,34 +1688,34 @@@ msgstr " "Por favor utilice apt-cdrom para hacer que APT reconozca este CD.\n" "apt-get update no se puede usar para agregar nuevos CDs" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD equivocado" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "No pude desmontar el CD-ROM de %s, tal vez todavía este en uso." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Fichero no encontrado" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fichero no encontrado" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "No pude leer" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválido, los URIS locales no deben de empezar con //" @@@ -1702,7 -1755,7 +1773,7 @@@ msgstr "La conexión expiró msgid "Server closed the connection" msgstr "El servidor cerró la conexión" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@@ -1714,7 -1767,7 +1785,7 @@@ msgstr "Una respuesta desbordó el buffe msgid "Protocol corruption" msgstr "Corrupción del protocolo" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Error de escritura" @@@ -1815,43 -1868,81 +1886,81 @@@ msgstr "No pude crear un socket para % msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "No puedo iniciar la conexión a %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No pude conectarme a %s:%s (%s), expiró tiempo para conexión" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No pude conectarme a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "No pude resolver '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal al resolver '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo raro pasó resolviendo '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "No pude conectarme a %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "No se pudo bloquear %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Se instalarán los siguientes paquetes extras:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1935,10 -2026,6 +2044,6 @@@ msgstr "Fallo la conexión msgid "Internal error" msgstr "Error interno" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "La conexión se cerró prematuramente" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "No puedo hacer mmap de un fichero vacío" @@@ -1953,59 -2040,59 +2058,59 @@@ msgstr "No pude hacer mmap de %lu bytes msgid "Selection %s not found" msgstr "Selección %s no encontrada" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo de abreviación no reconocida: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Abriendo fichero de configuración %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Línea %d demasiado larga (máx %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error de sintaxis %s:%u: Marca mal formada" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error de sintaxis %s:%u: Basura extra después del valor" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Error de sintaxis %s:%u: Las directivas sólo se pueden poner\n" "en el primer nivel" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error de sintaxis %s:%u: Incluido desde aquí" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: Directiva '%s' no soportada" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo" @@@ -2073,7 -2160,7 +2178,7 @@@ msgstr "Operación inválida: %s msgid "Unable to stat the mount point %s" msgstr "No se puede obtener información del punto de montaje %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "No se pudo cambiar a %s" @@@ -2082,70 -2169,70 +2187,70 @@@ msgid "Failed to stat the cdrom" msgstr "No pude montar el cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No se utiliza bloqueos para el fichero de bloqueo de sólo lectura %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "No se pudo abrir el fichero de bloqueo '%s'" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "No se pudo bloquear %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba allí" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subproceso %s recibió un fallo de segmentación." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subproceso %s devolvió un código de error (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s terminó de forma inesperada" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "leídos, todavía debía leer %lu pero no queda nada" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problemas cerrando el archivo" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Hay problemas desligando el fichero %s" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Hay problemas sincronizando el fichero" @@@ -2218,18 -2305,18 +2323,28 @@@ msgstr "opcional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Creando árbol de dependencias" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versiones candidatas" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generación de dependencias" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Fusionando información disponible" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Falló el cierre del archivo %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2240,52 -2327,52 +2355,52 @@@ msgstr "No se pudo tratar el archivo d msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línea %lu mal formada en lista de fuentes %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línea %lu mal formada en lista de fuentes %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línea %lu mal formada en lista de fuentes %s (análisis de URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línea %lu mal formada en lista de fuentes %s (dist absoluta)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línea %lu mal formada en lista de fuentes %s (análisis de dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abriendo %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Línea %u demasiado larga en la lista de fuentes %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Línea %u mal formada en lista de fuentes %s (tipo)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Tipo '%s' desconocido en la línea %u de lista de fuentes %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Línea %u mal formada en la lista de fuentes %s (id del fabricante)" @@@ -2307,7 -2394,7 +2422,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "No se da soporte para el tipo de archivo de índice '%s'" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2315,7 -2402,7 +2430,7 @@@ msgstr " "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para " "éste." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2323,38 -2410,51 +2438,51 @@@ msgstr " "Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido " "causado por paquetes retenidos." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes\n" "rotos." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Falta el directorio de listas %spartial." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Falta el directorio de archivos %spartial." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "No se pudo encontrar el método %s." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "El método %s no se inició correctamente" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Cambio de medio: Por favor inserte el disco etiquetado\n" + " '%s'\n" + "en la unidad '%s' y presione Intro\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema de paquetes '%s' no está soportado" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado" @@@ -2391,87 -2491,87 +2519,87 @@@ msgstr "No se entiende el pin tipo %s msgid "No priority (or zero) specified for pin" msgstr "No hay prioridad especificada para pin (o es cero)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "La caché tiene una versión incompatible de sistema de versiones" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Ocurrió un error mientras se procesaba %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ocurrió un error mientras se procesaba %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ocurrió un error mientras se procesaba %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ocurrió un error mientras se procesaba %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ocurrió un error mientras se procesaba %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ocurrió un error mientras se procesaba %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ocurrió un error mientras se procesaba %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vaya, excedió el número de nombres de paquetes que este APT es capaz de " "manejar." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Vaya, excedió el número de versiones que este APT es capaz de manejar." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vaya, excedió el número de dependencias que este APT es capaz de manejar." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Ocurrió un error mientras procesaba %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Ocurrió un error mientras procesaba %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Al procesar las dependencias de archivos no se encontró el\n" "paquete %s %s" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Error de E/S guardando caché fuente" @@@ -2480,11 -2580,11 +2608,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "falló el cambio de nombre, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2494,7 -2594,7 +2622,7 @@@ msgstr " "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2503,7 -2603,7 +2631,7 @@@ msgstr " "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2511,7 -2611,7 +2639,7 @@@ msgstr " "Los archivos de índice de paquetes están corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "El tamaño difiere" @@@ -2520,7 -2620,7 +2648,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Bloque de fabricante %s sin huella digital" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2529,47 -2629,47 +2657,47 @@@ msgstr " "Usando el punto de montaje del CD-ROM %s\n" "Montando el CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identificando.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Etiqueta guardada: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el punto de montaje del CD-ROM %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Desmontando el CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Esperando el disco...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Montando el CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Buscando en el disco archivos de índices...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Se encontraron %i índices de paquetes, %i de fuentes y %i firmas\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Ese no es un nombre válido, inténtelo de nuevo.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2578,19 -2678,19 +2706,19 @@@ msgstr " "Este disco se llama: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Copiando las listas de paquetes..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Escribiendo nueva lista de fuente\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Desmontando CD-ROM..." @@@ -2615,6 -2715,60 +2743,60 @@@ msgid "Wrote %i records with %i missin msgstr "" "%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Hay problemas abriendo %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Abriendo %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Abriendo fichero de configuración %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Conectando a %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instalados: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Abriendo %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Recomienda" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "La conexión se cerró prematuramente" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID del fabricante '%s' desconocido en la línea %u de la lista de\n" @@@ -2800,9 -2954,6 +2982,6 @@@ #~ msgid "Generating cache" #~ msgstr "Generando el caché" - #~ msgid "Problem opening %s" - #~ msgstr "Hay problemas abriendo %s" - #~ msgid "Problem with SelectFile" #~ msgstr "Hay problemas con SelectFile" @@@ -2827,9 -2978,6 +3006,6 @@@ #~ msgid "Failed to rename %s.new to %s" #~ msgstr "No pude renombrar %s.new a %s" - #~ msgid "Please insert a Disc in the drive and press enter" - #~ msgstr "Por favor inserte un disco en la unidad y presione Intro" - #~ msgid "I found (binary):" #~ msgstr "Encontré (binario):" @@@ -2848,16 -2996,9 +3024,9 @@@ #~ "No pude localizar ningún archivo de paquete, tal vez este no es un disco " #~ "de Debian" - #~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" - #~ msgstr "" - #~ "Por favor provea un nombre para este disco, como 'Debian 2.1r1 Disco 1'" - #~ msgid " '" #~ msgstr " '" - #~ msgid "Repeat this process for the rest of the CDs in your set." - #~ msgstr "Repita este proceso para el resto de los CDs del conjunto." - #~ msgid "" #~ "Usage: apt-cdrom [options] command\n" #~ "\n" @@@ -2905,25 -3046,6 +3074,6 @@@ #~ msgid "Internal error, non-zero counts" #~ msgstr "Error interno, cuenta diferentes de cero" - #~ msgid "Internal error, InstallPackages was called with broken packages!" - #~ msgstr "Error interno, InstallPackages fue llamado con un paquete roto!" - - #~ msgid "Internal error, Ordering didn't finish" - #~ msgstr "Error interno, no terminó el ordenamiento" - - #~ msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" - #~ msgstr "" - #~ "Que raro.. Los tamaños no concuerdan, mande un correo a \n" - #~ "apt@packages.debian.org" - - #~ msgid "Couldn't determine free space in %s" - #~ msgstr "No pude determinar el espacio libre en %s" - - #~ msgid "Internal error, problem resolver broke stuff" - #~ msgstr "" - #~ "Error interno, el sistema de solución de problemas rompió\n" - #~ "algunas cosas" - #~ msgid "Couldn't wait for subprocess" #~ msgstr "No pude esperar al subproceso" diff --combined po/eu.po index 590e916f8,7310e029d..c7817aa95 --- a/po/eu.po +++ b/po/eu.po @@@ -1,20 -1,21 +1,20 @@@ -# translation of apt-eu.po to Basque +# translation of apt-eu.po to Basque # This file is put in the public domain. # Hizkuntza Politikarako Sailburuordetza , 2005. -# Piarres Beobide , 2005. # msgid "" msgstr "" -"Project-Id-Version: apt_po_eu\n" +"Project-Id-Version: apt-eu\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-11-07 22:37+0100\n" -"Last-Translator: Piarres Beobide \n" -"Language-Team: librezale.org \n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-04-20 20:05+0200\n" +"Last-Translator: Hizkuntza Politikarako Sailburuordetza \n" +"Language-Team: Basque \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: KBabel 1.9.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "\n" #: cmdline/apt-cache.cc:135 @@@ -151,8 -152,8 +151,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s) konpilatua: %s %s\n" @@@ -230,6 -231,19 +230,21 @@@ msgstr " " -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" "Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" -"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan" + + #: cmdline/apt-cdrom.cc:93 ++#, fuzzy + msgid "Please insert a Disc in the drive and press enter" -msgstr "Mesedez sa diska bat gailuan eta enter sakatu" ++msgstr "" ++"Euskarri-aldaketa: sartu '%s'\n" ++"diskoa '%s' unitatean, eta sakatu Sartu\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu." ++msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Parekatu gabeko argumentuak" @@@ -291,7 -305,7 +306,7 @@@ msgstr " " -c=? Irakurri konfigurazio-fitxategi hau\n" " -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" @@@ -300,31 -314,31 +315,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Pakete-luzapenen zerrenda luzeegia da" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Errorea direktorioa prozesatzean %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Iturburu-luzapenen zerrenda luzeegia da" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Errorea eduki-fitxategiaren goiburua idaztean" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Errorea edukiak prozesatzean %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -403,11 -417,11 +418,11 @@@ msgstr " " -c=? Irakurri konfigurazio-fitxategi hau\n" " -o=? Ezarri konfigurazio-aukera arbitrario bat" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Ez dago bat datorren hautapenik" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Fitxategi batzuk falta dira `%s' pakete-fitxategien taldean" @@@ -440,83 -454,83 +455,83 @@@ msgstr "Artxiboak ez du kontrol-erregis msgid "Unable to get a cursor" msgstr "Ezin da kurtsorerik eskuratu" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Ezin da %s direktorioa irakurri\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Ezin da %s atzitu\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "A: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Erroreak fitxategiari dagozkio " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Huts egin du %s ebaztean" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Huts egin dute zuhaitz-urratsek" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Huts egin du %s irekitzean" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Huts egin du %s esteka irakurtzean" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Huts egin du %s desestekatzean" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Ezin izan da %s %s(r)ekin estekatu" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-en mugara (%sB) heldu da.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Huts egin du %s(e)tik datuak lortzean" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Artxiboak ez du pakete-eremurik" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" @@@ -616,80 -630,79 +631,80 @@@ msgstr "Arazoa %s desestekatzean msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio-errorea - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "baina ez da instalagarria" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "baina ez dago instalatuta" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " edo" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -697,123 -710,146 +712,145 @@@ msgstr " "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horelakorik egin, ez badakizu ondo zertan ari zaren!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio-berrituta, %lu berriki instalatuta, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Mendekotasunak zuzentzen..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " : huts egin du." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Ezin dira mendekotasunak zuzendu" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Ezin da bertsio-berritzeko multzoa minimizatu" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Eginda" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Egiaztapen abisua gainidazten.\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Paketeak egiaztapen gabe instalatu [b/E]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" ++msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Barne errorea, ez da ordenatzeaz amaitu" ++msgstr "Barne errorea desbideratze bat gehitzean" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga-direktorioa blokeatu" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Ezin izan da iturburu-zerrenda irakurri." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" -"Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " -"berri emanez (ingelesez)" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Artxiboetako %sB eskuratu behar dira.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "Ezin da %s(e)n duzun leku librea atzeman." ++msgstr "Ez daukazu nahikoa leku libre %s(e)n." + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -823,28 -859,28 +860,28 @@@ msgstr " "Jarratzeko, idatzi '%s' esaldia\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abortatu." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -852,47 -888,47 +889,47 @@@ msgstr " "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Abortatu instalazioa." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Oharra, %s hautatzen %s(r)en ordez\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s pakete birtual bat da, honek hornitua:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instalatuta]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Zehazki bat hautatu behar duzu instalatzeko." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -903,49 -939,49 +940,49 @@@ msgstr " "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n" "beste iturburu batean bakarrik egongo da erabilgarri\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Baina ondorengo paketeek ordezten dute:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "%s paketeak ez du instalatzeko hautagairik" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda-direktorioa blokeatu" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -953,25 -989,25 +990,44 @@@ msgstr " "Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " "zaharrak erabili dira haien ordez." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Informazio honek arazoa konpontzen lagun dezake:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Barne-errorea, AllUpgrade-k zerbait hautsi du" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -979,7 -1015,7 +1035,7 @@@ msgstr " "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -991,7 -1027,7 +1047,7 @@@ msgstr " "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1000,107 -1036,116 +1056,113 @@@ msgstr " "Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n" "izango, eta pakete horren errorearen berri ematea komeni da." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Informazio honek arazoa konpontzen lagun dezake:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Hautsitako paketeak" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Huts egin du" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Eginda" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" ++msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturubura\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze-mendekotasunik.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1108,7 -1153,7 +1170,7 @@@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1117,32 -1162,32 +1179,32 @@@ msgstr " "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Onartutako Moduluak:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1392,7 -1437,7 +1454,7 @@@ msgid "Duplicate conf file %s/%s msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format +#, fuzzy, c-format msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" @@@ -1448,8 -1493,8 +1510,9 @@@ msgstr "Gainidatzi pakete-konkordantzi msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" @@@ -1479,9 -1524,9 +1542,9 @@@ msgid "The info and temp directories ne msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Pakete Zerrenda irakurtzen" @@@ -1589,12 -1634,12 +1652,12 @@@ msgstr "Ezin izan da baliozko kontrol-f msgid "Unparsable control file" msgstr "Kontrol fitxategi ezin analizagarria" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Ezin da cdrom-eko %s datu-basea irakurri" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1602,28 -1647,34 +1665,34 @@@ msgstr " "Mesedez erabili apt-cdrom APT-k CD hau ezagutu dezan.\n" "apt-get update ezin da erabili CD berriak gehitzeko" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD okerra" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "" -"Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da." +msgstr "Ezin izan da CDROMa %s(e)n muntatu; beharbada erabiltzen ariko da." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Ez da diska aurkitu" ++msgstr "Ez da fitxategia aurkitu" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Ez da fitxategia aurkitu" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Huts egin du atzitzean" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa-ordua ezartzean" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "URI baliogabea. URI lokalek ezin dute // eduki hasieran" @@@ -1683,7 -1734,7 +1752,7 @@@ msgstr "Konexioaren denbora-muga msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Irakurketa-errorea" @@@ -1695,7 -1746,7 +1764,7 @@@ msgstr "Erantzun batek bufferrari gaine msgid "Protocol corruption" msgstr "Protokolo-hondatzea" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Idazketa-errorea" @@@ -1797,44 -1848,82 +1866,82 @@@ msgstr "Ezin izan da socket-ik sortu ho msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Ezin izan da konektatu -> %s:%s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Konektatzen -> %s..." - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Ezin izan da '%s' ebatzi" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Aldi baterako akatsa '%s' ebaztean" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ezin da konektatu -> %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten." ++msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" ++msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Beintza sinadura baliogabe bat aurkitu da." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Ezin izan da %s exekutatu" ++msgstr "Ezin izan da %s blokeoa hartu" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr " sinadura egiaztatzeko (gnupg instalaturik al dago?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Errore ezezaguna gpgv exekutatzean" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Ondorengo sinadurak baliogabeak dira:\n" ++msgstr "Ondorengo pakete gehigarriak instalatuko dira:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago " -"eskuragarri:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1918,10 -2007,6 +2025,6 @@@ msgstr "Konexioak huts egin du msgid "Internal error" msgstr "Barne-errorea" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Konexioa behar baino lehenago itxi da" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Ezin da fitxategi huts baten mmap egin" @@@ -1936,57 -2021,57 +2039,57 @@@ msgstr "Ezin izan da %lu byteren mmap e msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Mota ezezaguneko laburtzapena: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurazio-fitxategia irekitzen" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "%d lerroa luzeegia da (gehienez %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Sintaxi-errorea, %s:%u: Blokearen hasieran ez dago izenik." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Sintasi errorea %s:%u: Gaizki eratutako" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria balioaren ondoren" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Sintaxi-errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Sintaxi-errorea, %s:%u: habiaratutako elementu gehiegi" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Sintaxi-errorea, %s:%u: hemendik barne hartuta" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Sintaxi-errorea, %s:%u: onartu gabeko '%s' direktiba" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran" @@@ -2053,7 -2138,7 +2156,7 @@@ msgstr "Eragiketa baliogabea: %s msgid "Unable to stat the mount point %s" msgstr "Ezin da atzitu %s muntatze-puntua" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ezin da %s(e)ra aldatu" @@@ -2062,73 -2147,73 +2165,73 @@@ msgid "Failed to stat the cdrom" msgstr "Huts egin du CDROMa atzitzean" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo-" "fitxategiarentzat" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Ezin izan da %s blokeo-fitxategia ireki" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Ezin izan da %s blokeoa hartu" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s azpiprozesuak segmentazio-hutsegitea jaso du." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s azpiprozesuak errore-kode bat itzuli du (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Arazoa fitxategia ixtean" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Arazoa fitxategia desestekatzean" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@@ -2201,18 -2286,18 +2304,28 @@@ msgstr "aukerakoa msgid "extra" msgstr "estra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Dependentzia zuhaitza eraikitzen" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Hautagaien bertsioak" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Dependentzi Sormena" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Eskuragarrien datuak biltzen" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Ezin izan da %s fitxategian idatzi" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2223,52 -2308,52 +2336,52 @@@ msgstr "Ezin da %s pakete-fitxategia an msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete-fitxategia analizatu (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI analisia)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist analisia)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s irekitzen" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu-zerrendako %1$u lerroa luzeegia da." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "'%1$s' mota ez da ezagutzen %3$s iturburu-zerrendako %2$u lerroan" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (hornitzaile id-a)" @@@ -2290,14 -2375,14 +2403,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "'%s' motako indize-fitxategirik ez da onartzen" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2305,36 -2390,46 +2418,48 @@@ msgstr " "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " "atxikitako paketeek eraginda." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "%spartial zerrenda-direktorioa falta da." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "%spartial artxibo-direktorioa falta da." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "%li fitxategi deskargatzen %li -fitxategitik (%s falta da)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ezin izan da %s metodo-kontrolatzailea aurkitu." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" ++msgstr "" ++"Euskarri-aldaketa: sartu '%s'\n" ++"diskoa '%s' unitatean, eta sakatu Sartu\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' pakete-sistema ez da onartzen" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu" @@@ -2368,82 -2463,82 +2493,82 @@@ msgstr "Ez da ulertu %s orratz-mota (pi msgid "No priority (or zero) specified for pin" msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Cachearen bertsio-sistema ez da bateragarria" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Errorea gertatu da %s prozesatzean (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "APT honek maneia dezakeen pakete-izenen kopurua gainditu duzu." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "APT honek maneia dezakeen mendekotasun-kopurua gainditu duzu." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "%s %s paketea ez da aurkitu fitxategi-mendekotasunak prozesatzean" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ezin da atzitu %s iturburu-paketeen zerrenda" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Fitxategi-erreferentziak biltzen" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "S/I errorea iturburu-cachea gordetzean" @@@ -2452,11 -2547,11 +2577,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2465,7 -2560,7 +2590,7 @@@ msgstr " "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2474,7 -2569,7 +2599,7 @@@ msgstr " "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2482,16 -2577,16 +2607,16 @@@ msgstr " "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Tamaina ez dator bat" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "%s saltzaile blokeak ez du egiaztapen markarik" +msgstr "%s saltzaile blokeak ez du egiatzpen markarik" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2500,47 -2595,47 +2625,47 @@@ msgstr " "%s CD-ROM muntatze puntua erabiltzen\n" "CD-ROM-a muntatzen\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Egiaztatzen... " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Gordetako Etiketa: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM muntatze puntua erabiltzen\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM-a desmuntatzen\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Diska itxaroten...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM-a muntatzen...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Indize fitxategien bila diska arakatzen...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "%i pakete indize, %i jatorri indize eta %i sinadura aurkitu dira\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Hau ez baliozko izen bat, froga berriro.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2549,19 -2644,19 +2674,19 @@@ msgstr " "Diskaren izen:\n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Pakete zerrendak kopiatzen..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "jatorri zerrenda berria idazten\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Diskarentzako jaotrri sarrerak:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "CD-ROM Desmuntatzen..." @@@ -2586,202 -2681,56 +2711,245 @@@ msgid "Wrote %i records with %i missin msgstr "" "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "%s prestatzen" ++msgstr "%s irekitzen" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s irekitzen" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "%s konfiguratzeko prestatzen" ++msgstr "%s konfigurazio-fitxategia irekitzen" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "%s konfiguratzen" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "%s Instalatuta" ++msgstr " Instalatuta: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "%s kentzeko prestatzen" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "%s kentzen" ++msgstr "%s irekitzen" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "%s kendurik" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "%s konfigurazioaz ezabatzeko prestatzen" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "%s konfigurazioaz kentzen" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Konexioa behar baino lehenago itxi da" ++ +#~ msgid "Total Package Names : " +#~ msgstr "Pakete-izenak guztira: " + +#~ msgid " Normal Packages: " +#~ msgstr " Pakete normalak: " + +#~ msgid " Pure Virtual Packages: " +#~ msgstr " Pakete birtual puruak: " + +#~ msgid " Single Virtual Packages: " +#~ msgstr " Pakete birtual soilak: " + +#~ msgid " Mixed Virtual Packages: " +#~ msgstr " Pakete birtual nahasiak: " + +#~ msgid "Total Distinct Versions: " +#~ msgstr "Bertsio desberdinak guztira: " + +#~ msgid "Total Dependencies: " +#~ msgstr "Mendekotasunak guztira: " + +#~ msgid "Total Ver/File relations: " +#~ msgstr "Bertsio/fitxategi erlazioak guztira: " + +#~ msgid "Total Provides Mappings: " +#~ msgstr "Hornidura-mapatzeak guztira: " + +#~ msgid "Total Globbed Strings: " +#~ msgstr "Globalizatutako kateak guztira: " + +#~ msgid "Total Dependency Version space: " +#~ msgstr "Mendekotasun-bertsioen lekua guztira: " + +#~ msgid "Total Slack space: " +#~ msgstr "Slack lekua guztira: " + +#~ msgid "Total Space Accounted for: " +#~ msgstr "Hartutako lekua guztira: " + +#~ msgid "Package Files:" +#~ msgstr "Pakete-fitxategiak:" + +#~ msgid "Pinned Packages:" +#~ msgstr "Orratzdun paketeak (pin):" + +#~ msgid " Package Pin: " +#~ msgstr " Pakete-orratza (pin): " + +#~ msgid " Version Table:" +#~ msgstr " Bertsio-taula:" + +#~ msgid "Error Processing directory %s" +#~ msgstr "Errorea %s direktorioa prozesatzean" + +#~ msgid "Error Processing Contents %s" +#~ msgstr "Errorea %s edukia prozesatzean" + +#~ msgid "Unknown Compresison Algorithm '%s'" +#~ msgstr "Konpresio-algoritmo ezezaguna: '%s'" + +#~ msgid "Compress Child" +#~ msgstr "Konprimitu umea" + +#~ msgid "Internal Error, Failed to create %s" +#~ msgstr "Barne-errorea. Ezin izan da %s sortu" + +#~ msgid "Packages need to be removed but Remove is disabled." +#~ msgstr "" +#~ "Paketeak kendu egin behar dira, baina Kentzeko aukera desgaituta dago." + +#~ msgid "Do you want to continue? [Y/n] " +#~ msgstr "Jarraitu nahi duzu? [B/e] " + +#~ msgid "Aborting Install." +#~ msgstr "Instalazioa abortatzen." + - #~ msgid "Internal Error, AllUpgrade broke stuff" - #~ msgstr "Barne-errorea, AllUpgrade-k zerbait hautsi du" - +#~ msgid "Calculating Upgrade... " +#~ msgstr "Bertsio-berritzea kalkulatzen... " + +#~ msgid "Fetch Source %s\n" +#~ msgstr "Lortu %s iturburua\n" + +#~ msgid "Supported Modules:" +#~ msgstr "Onartutako moduluak:" + - #~ msgid "" - #~ "Media Change: Please insert the disc labeled\n" - #~ " '%s'\n" - #~ "in the drive '%s' and press enter\n" - #~ msgstr "" - #~ "Euskarri-aldaketa: sartu '%s'\n" - #~ "diskoa '%s' unitatean, eta sakatu Sartu\n" - +#~ msgid "Merging Available information" +#~ msgstr "Informazio erabilgarria batzen" + +#~ msgid "Tar Checksum failed, archive corrupted" +#~ msgstr "Tar Checksum-ek huts egin du; artxiboa hondatuta dago" + +#~ msgid "Internal Error in AddDiversion" +#~ msgstr "Barne-errorea AddDiversion-en" + +#~ msgid "Reading Package Lists" +#~ msgstr "Pakete-zerrendak irakurtzen" + +#~ msgid "Internal Error getting a Package Name" +#~ msgstr "Barne-errorea pakete-izen bat eskuratzean" + +#~ msgid "Reading File Listing" +#~ msgstr "Fitxategi-zerrenda irakurtzen" + +#~ msgid "Internal Error getting a Node" +#~ msgstr "Barne-errorea nodo bat eskuratzean" + +#~ msgid "Internal Error adding a diversion" +#~ msgstr "Barne-errorea desbideratze bat gehitzean" + +#~ msgid "Reading File List" +#~ msgstr "Fitxategi-zerrenda irakurtzen" + +#~ msgid "Failed to find a Package: Header, offset %lu" +#~ msgstr "Ezin izan da aurkitu Paketea: Goiburua, desplazamendua %lu" + +#~ msgid "Internal Error, could not locate member %s" +#~ msgstr "Barne-errorea; ezin izan da %s kidea lokalizatu" + +#~ msgid "Internal Error, could not locate member" +#~ msgstr "Barne-errorea; ezin izan da kidea lokalizatu" + +#~ msgid "Unparsible control file" +#~ msgstr "Kontrol-fitxategi analizaezina" + +#~ msgid "" +#~ "Please use apt-cdrom to make this CD recognized by APT. apt-get update " +#~ "cannot be used to add new CDs" +#~ msgstr "" +#~ "Erabili apt-cdrom, CD hau APTk identifika dezan. apt-get eguneratzea ezin " +#~ "da erabili CD berriak gehitzeko" + +#~ msgid "Wrong CD" +#~ msgstr "CD okerra" + +#~ msgid "Server refused our connection and said: %s" +#~ msgstr "Zerbitzariak gure konexioa ezetsi du, eta hau esan du: %s" + +#~ msgid "Write Error" +#~ msgstr "Idazketa-errorea" + +#~ msgid "The http server sent an invalid reply header" +#~ msgstr "Http zerbitzariak erantzun-goiburu baliogabe bat bidali du" + +#~ msgid "The http server sent an invalid Content-Length header" +#~ msgstr "Http zerbitzariak Content-Length goiburu baliogabe bat bidali du" + +#~ msgid "The http server sent an invalid Content-Range header" +#~ msgstr "Http zerbitzariak Content-Range goiburu baliogabe bat bidali du" + +#~ msgid "This http server has broken range support" +#~ msgstr "Http zerbitzari honek barruti-onarpena hautsita dauka" + +#~ msgid "Error reading from server Remote end closed connection" +#~ msgstr "Errorea zerbitzaritik irakurtzean: Urruneko aldeak konexioa itxi du" + +#~ msgid "Bad header Data" +#~ msgstr "Okerreko goiburu-datuak" + +#~ msgid "Syntax error %s:%u: Malformed Tag" +#~ msgstr "Sintaxi-errorea, %s:%u: Etiketa gaizki osatuta" + +#~ msgid "Waited, for %s but it wasn't there" +#~ msgstr "%s(r)en zain egon da, baina ez zegoen hor" + +#~ msgid "This APT does not support the Versioning System '%s'" +#~ msgstr "APT honek ez du onartzen '%s' bertsio-sistema" + +#~ msgid "Building Dependency Tree" +#~ msgstr "Mendekotasunen zuhaitza eraikitzen" + +#~ msgid "Candidate Versions" +#~ msgstr "Hautagai dauden bertsioak" + +#~ msgid "Dependency Generation" +#~ msgstr "Mendekotasunak sortzea" + +#~ msgid "Malformed line %lu in source list %s (Absolute dist)" +#~ msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist absolutua)" + +#~ msgid "Vendor block %s is invalid" +#~ msgstr "%s hornitzaile-blokea ez da baliozkoa" + +#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" +#~ msgstr "" +#~ "'%1$s' hornitzaile-id ezezaguna %3$s iturburu-zerrendako %2$u lerroan" + +#~ msgid "File Not Found" +#~ msgstr "Ez da fitxategia aurkitu" diff --combined po/fi.po index 04cc6473c,fa0102ec1..dbc6587a4 --- a/po/fi.po +++ b/po/fi.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@@ -149,8 -149,8 +149,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n" @@@ -228,6 -228,22 +228,22 @@@ msgstr " " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" "Lisätietoja apt-cache(8) ja apt.conf(5) käsikirjasivuilla.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Taltion vaihto: Pistä levy \n" + "\"%s\"\n" + "asemaan \"%s\" ja paina Enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Parametrit eivät ole pareittain" @@@ -289,7 -305,7 +305,7 @@@ msgstr " " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" @@@ -298,32 -314,32 +314,32 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Paketin laajennuslista on liian pitkä" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Tapahtui virhe käsiteltäessa kansiota %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Lähteiden laajennuslista on liian pitkä" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "" "Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -406,11 -422,11 +422,11 @@@ msgstr " " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Mitkään valinnat eivät täsmänneet" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja" @@@ -443,83 -459,83 +459,83 @@@ msgstr "Arkistolla ei ole ohjaustietuet msgid "Unable to get a cursor" msgstr "Kohdistinta ei saada" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kansiota %s ei voi lukea\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Tdstolle %s ei toimi stat\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Tiedostossa virheitä " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Osoitteen %s selvitys ei onnistunut" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Puun läpikäynti ei onnistunut" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Tiedoston %s avaaminen ei onnistunut" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "readlink %s ei onnistunut" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "unlink %s ei onnistunut" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linkin %s -> %s luonti ei onnistunut" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLinkin yläraja %st saavutettu.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Tiedostolle %s ei toimi stat" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttää" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s: ei poikkeustietuetta\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" @@@ -619,79 -635,79 +635,79 @@@ msgstr "Ilmeni pulmia poistettaessa tie msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "K" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "mutta ei ole asennettu" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " tai" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -700,123 -716,145 +716,145 @@@ msgstr " "VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Korjataan riippuvuuksia..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " ei onnistunut." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Riippuvuuksien korjaus ei onnistu" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Päivitysjoukon minimointi ei onnistu" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Valmis" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Noudettavaa arkistoa %st/%st.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Noudettavaa arkistoa %st.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -827,28 -865,28 +865,28 @@@ msgstr " "Jatka kirjoittamalla \"%s\"\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Keskeytä." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -856,47 -894,47 +894,47 @@@ msgstr " "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\"auttaa tai " "kokeile --fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Asennus keskeytetään." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Huomautus, valitaan %s eikä %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Asennettu]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Yksi pitää valita asennettavaksi." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -907,49 -945,49 +945,49 @@@ msgstr " "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n" "saatavilla vain jostain muusta lähteestä\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Seuraavat paketit kuitenkin korvaavat sen:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketilla %s ei ole asennettavaa valintaa" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -957,25 -995,25 +995,44 @@@ msgstr " "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " "käytetty vanhoja. " - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -983,7 -1021,7 +1040,7 @@@ msgstr " "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -994,7 -1032,7 +1051,7 @@@ msgstr " "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1004,106 -1042,116 +1061,112 @@@ msgstr " "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" "tuosta paketista." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Rikkinäiset paketit" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Suositellut paketit:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ei onnistunut" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Valmis" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1111,7 -1159,7 +1174,7 @@@ msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1120,32 -1168,32 +1183,32 @@@ msgstr " "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Tuetut moduulit:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1451,8 -1499,8 +1514,9 @@@ msgstr "Päälle kirjoitettava paketti msgid "File %s/%s overwrites the one in the package %s" msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" @@@ -1482,9 -1530,9 +1546,9 @@@ msgid "The info and temp directories ne msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Luetaan pakettiluetteloita" @@@ -1591,12 -1639,12 +1655,12 @@@ msgstr "Kelvollista ohjaustiedostoa ei msgid "Unparsable control file" msgstr "Ohjaustiedosto ei jäsenny" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Rompputietokantaa %s ei voi lukea" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1604,28 -1652,34 +1668,34 @@@ msgstr " "Käytä komentoa apt-cdrom jotta APT tunnistaa tämän rompun, apt-get update ei " "osaa lisätä uusia romppuja" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Väärä romppu" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Tiedostoa ei löydy" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Tiedostoa ei löydy" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Komento stat ei toiminut" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "URI on kelvoton, paikallinen URI ei saa alkaa //" @@@ -1683,7 -1737,7 +1753,7 @@@ msgstr "Yhteys aikakatkaistiin msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Lukuvirhe" @@@ -1695,7 -1749,7 +1765,7 @@@ msgstr "Vastaus aiheutti puskurin ylivu msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Virhe kirjoitettaessa" @@@ -1796,43 -1850,81 +1866,81 @@@ msgstr "Pistokeen luonti ei onnistu %s msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Yhteyden %s avaus ei onnistu: %s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Avataan yhteys %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Nimeä \"%s\" ei voitu selvittää" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tilapäinen häiriö selvitettäessä \"%s\"" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Lukkoa %s ei saada" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1916,10 -2008,6 +2024,6 @@@ msgstr "Yhteys ei toiminut msgid "Internal error" msgstr "Sisäinen virhe" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Yhteys katkesi ennenaikaisesti" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia" @@@ -1934,57 -2022,57 +2038,57 @@@ msgstr "Ei voitu tehdä %lu tavun mmap: msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tuntematon tyypin lyhenne: \"%c\"" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Avataan asetustiedosto %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Rivi %d on liian pitkä (enintään %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\"" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa" @@@ -2050,7 -2138,7 +2154,7 @@@ msgstr "Virheellinen toiminto %s msgid "Unable to stat the mount point %s" msgstr "Komento stat ei toiminut liitoskohdalle %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kansioon %s vaihto ei onnistu" @@@ -2059,70 -2147,70 +2163,70 @@@ msgid "Failed to stat the cdrom" msgstr "Komento stat ei toiminut rompulle" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Lukkotiedostoa %s ei voitu avata" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Lukkoa %s ei saada" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Aliprosessi %s aiheutti suojausvirheen." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Aliprosessi %s palautti virhekoodin (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Pulmia tiedoston sulkemisessa" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Pulmia tehtäessä tiedostolle unlink" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@@ -2195,18 -2283,18 +2299,28 @@@ msgstr "valinnainen msgid "extra" msgstr "ylimääräinen" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Muodostetaan riippuvuussuhteiden puu" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Mahdolliset versiot" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Luodaan riippuvuudet" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Yhdistetään saatavuustiedot" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Tiedoston %s kirjoittaminen ei onnistunut" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2217,52 -2305,52 +2331,52 @@@ msgstr "Pakettitiedostoa %s (1) ei voi msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Avataan %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)" @@@ -2283,13 -2371,13 +2397,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2297,36 -2385,49 +2411,49 @@@ msgstr " "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " "paketit." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Luettelokansio %spartial puuttuu." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkistokansio %spartial puuttuu." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Menetelmän ajuria %s ei löytynyt" - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Menetelmä %s ei käynnistynyt oikein" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Taltion vaihto: Pistä levy \n" + "\"%s\"\n" + "asemaan \"%s\" ja paina Enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" @@@ -2361,83 -2462,83 +2488,83 @@@ msgstr "Tunnistetyyppi %s on tuntematon msgid "No priority (or zero) specified for pin" msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" @@@ -2446,11 -2547,11 +2573,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2459,7 -2560,7 +2586,7 @@@ msgstr " "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2468,7 -2569,7 +2595,7 @@@ msgstr " "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2476,7 -2577,7 +2603,7 @@@ msgstr " "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Koko ei täsmää" @@@ -2485,7 -2586,7 +2612,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Toimittajan lohkosta %s puuttuu sormenjälki" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2494,49 -2595,49 +2621,49 @@@ msgstr " "Käytetään rompun liitoskohtaa %s\n" "Liitetään romppu\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Tunnistetaan... " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Tallennettu nimio: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Käytetään rompun liitoskohtaa %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Irrotetaan romppu\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Odotetaan levyä...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Liitetään romppu...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Etsitään levyltä hakemistotiedostoja...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" "Asennuspakettien hakemistoja löytyi %i, lähdekoodipakettien hakemistoja %i " "ja allekirjoituksia %i\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2545,19 -2646,19 +2672,19 @@@ msgstr " "Tämä levy on: \n" "\"%s\"\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kopioidaan pakettiluetteloita..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Kirjoitetaan uusi lähdeluettelo\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Irrotetaan romppu..." @@@ -2583,6 -2684,60 +2710,60 @@@ msgstr " "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta " "tiedostoa\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Avataan %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Avataan %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Avataan asetustiedosto %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Avataan yhteys %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Asennettu: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Avataan %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Suosittelut" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Yhteys katkesi ennenaikaisesti" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "Tuntematon toimittajan tunniste \"%s\" rivillä %u lähdeluettelossa %s" diff --combined po/fr.po index 26323dd75,f14a10b96..ced13aa47 --- a/po/fr.po +++ b/po/fr.po @@@ -2,20 -2,20 +2,20 @@@ # Advanced Package Transfer - APT message translation catalog # French messages # Pierre Machard , 2002,2003,2004. -# Christian Perrier , 2004-2005. +# Christian Perrier , 2004. # msgid "" msgstr "" -"Project-Id-Version: fr\n" +"Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-11-01 18:16+0100\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-07-28 20:52+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.2\n" +"X-Generator: KBabel 1.9.1\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" #: cmdline/apt-cache.cc:135 @@@ -150,8 -150,8 +150,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pour %s %s est compilé le %s %s\n" @@@ -233,6 -233,22 +233,22 @@@ msgstr " "Regardez les pages de manuel de apt-cache(8) et apt.conf(5) pour plus\n" "d'informations.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" -"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" + + #: cmdline/apt-cdrom.cc:93 ++#, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" -"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" ++"Changement de support : veuillez insérer le disque\n" ++"« %s »\n" ++"dans le lecteur « %s » et appuyez sur la touche Entrée\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" -"Veuillez répéter cette opération pour tous les disques de votre jeu de " -"cédéroms." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Les arguments ne sont pas en parité" @@@ -294,40 -310,41 +310,41 @@@ msgstr " " -c=? Lit ce fichier de configuration\n" " -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Impossible d'écrire sur %s" #: 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 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "La liste d'extension du paquet est trop longue" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Erreur lors du traitement du répertoire %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "La liste d'extension des sources est trop grande" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Erreur du traitement du contenu %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -410,14 -427,15 +427,15 @@@ msgstr " " -c=? Lit ce fichier de configuration\n" " -o=? Place une option de configuration arbitraire" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Aucune sélection ne correspond" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, 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 @@@ -432,7 -450,7 +450,7 @@@ msgstr "Base de données ancienne, tenta #: ftparchive/cachedb.cc:73 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Impossible d'ouvrir le fichier de base de données %s : %s" +msgstr "Impossible d'ouvrir le fichier de base de données %s : %s" #: ftparchive/cachedb.cc:114 #, c-format @@@ -447,83 -465,83 +465,83 @@@ msgstr "L'archive n'a pas d'enregistrem msgid "Unable to get a cursor" msgstr "Impossible d'obtenir un curseur" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A : Impossible de lire le contenu du répertoire %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "A : Impossible de statuer %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E : " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "A : " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E : des erreurs sont survenues sur le fichier " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Impossible de résoudre %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Échec du parcours de l'arbre" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Impossible d'ouvrir %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " Délier %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Impossible de lire le lien %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Impossible de délier %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Impossible de lier %s à %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Seuil de delink de %so atteint.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Impossible de statuer %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "L'archive ne possède pas de champ de paquet" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr "%s ne possède pas d'entrée « override »\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" @@@ -623,79 -641,79 +641,79 @@@ msgstr "Problème en déliant %s msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "O" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra être installé" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "mais il n'est pas installable" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "mais il n'est pas installé" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "mais ne sera pas installé" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ou" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installés :" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVÉS :" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont été conservés :" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis à jour :" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changés :" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -704,114 -722,139 +722,138 @@@ msgstr " "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis à jour, %lu nouvellement installés, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu à enlever et %lu non mis à jour.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Correction des dépendances..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " a échoué." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Impossible de corriger les dépendances" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Impossible de minimiser le nombre des paquets mis à jour" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Fait" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 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." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." +msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Avertissement d'authentification ignoré.\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " -msgstr "Faut-il installer ces paquets sans vérification (o/N) ? " +msgstr "Faut-il installer ces paquets sans vérification (o/N) ? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu être authentifiés" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problèmes et -y a été employé sans --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés." ++msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 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:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Erreur interne. Le tri a été interrompu." ++msgstr "Erreur interne en ajoutant une déviation" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut être lue." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" -"Étrangement, les tailles ne correspondent pas. Veuillez le signaler par " -"courriel à apt@packages.debian.org." + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Il est nécessaire de prendre %so dans les archives.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, 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 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Après dépaquetage, %so d'espace disque seront libérés.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "Impossible de déterminer l'espace disponible sur %s" ++msgstr "Pas assez d'espace disponible sur %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération " @@@ -819,11 -862,11 +861,11 @@@ # The space before the exclamation mark must not be a non-breaking space; this # sentence is supposed to be typed by a user who cannot see the difference. - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" -msgstr "Oui, faites ce que je vous dis !" +msgstr "Oui, faites ce que je vous dis !" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -834,28 -877,28 +876,28 @@@ msgstr " "Pour continuer, tapez la phrase « %s »\n" " ?]" - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Annulation." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " -msgstr "Souhaitez-vous continuer [O/n] ? " +msgstr "Souhaitez-vous continuer [O/n] ? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -863,47 -906,48 +905,48 @@@ msgstr " "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-" "get update ou essayer avec --fix-missing ?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 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 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Annulation de l'installation." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, sélection de %s au lieu de %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Le paquet %s est un paquet virtuel fourni par :\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installé]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Vous devez explicitement sélectionner un paquet à installer." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -915,49 -959,50 +958,50 @@@ msgstr " "devenu obsolète\n" "ou qu'il n'est disponible que sur une autre source\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Cependant les paquets suivants le remplacent :" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Aucun paquet ne correspond au paquet %s" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, 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 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s est déjà la plus récente version disponible.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version « %s » de « %s » est introuvable" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version « %s » de « %s » n'a pu être trouvée" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas d'argument" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le répertoire de liste" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -965,25 -1010,26 +1009,45 @@@ msgstr " "Le téléchargement de quelques fichiers d'index a échoué, ils ont été " "ignorés, ou les anciens ont été utilisés à la place." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "L'information suivante devrait vous aider à résoudre la situation : " ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Erreur interne, AllUpgrade a cassé le boulot !" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 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:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -991,7 -1037,7 +1055,7 @@@ msgstr " "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1003,7 -1049,7 +1067,7 @@@ msgstr " "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1012,107 -1058,118 +1076,113 @@@ msgstr " "Puisque vous n'avez demandé qu'une seule opération, le paquet n'est\n" "probablement pas installable et vous devriez envoyer un rapport de bogue." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "L'information suivante devrait vous aider à résoudre la situation : " -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Paquets défectueux" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Paquets suggérés :" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Paquets recommandés :" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Échec" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Fait" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "" -"Erreur interne, la tentative de résolution du problème a cassé certaines " -"parties" ++msgstr "Erreur interne, AllUpgrade a cassé le boulot !" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Échec du processus fils" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1121,7 -1178,7 +1191,7 @@@ msgstr " "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1130,32 -1187,33 +1200,33 @@@ msgstr " "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "du paquet %s ne peut satisfaire à la version requise" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, 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:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Modules reconnus :" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1328,7 -1386,8 +1399,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." @@@ -1466,8 -1525,8 +1538,9 @@@ msgstr "Écrase la correspondance de paq msgid "File %s/%s overwrites the one in the package %s" msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" @@@ -1499,9 -1558,9 +1572,9 @@@ msgstr " "fichiers" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Lecture des listes de paquets" @@@ -1589,7 -1648,8 +1662,8 @@@ msgstr "Ce n'est pas une archive DEB va #: 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 »" ++"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 @@@ -1608,12 -1668,12 +1682,12 @@@ msgstr "Impossible de localiser un fich msgid "Unparsable control file" msgstr "Fichier de contrôle non traitable" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Impossible de lire la base de données %s du cédérom" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1621,30 -1681,35 +1695,36 @@@ 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" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "Mauvais cédérom" +msgstr "Mauvais CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Impossible de démonter le cédérom dans %s, il doit toujours être en cours " "d'utilisation." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Disque non trouvé." ++msgstr "Fichier non trouvé" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fichier non trouvé" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Impossible de statuer" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //" @@@ -1687,7 -1752,8 +1767,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 @@@ -1702,7 -1768,7 +1783,7 @@@ msgstr "Dépassement du délai de connexi msgid "Server closed the connection" msgstr "Le serveur a fermé la connexion" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Erreur de lecture" @@@ -1714,7 -1780,7 +1795,7 @@@ msgstr "Une réponse a fait déborder le msgid "Protocol corruption" msgstr "Corruption du protocole" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Erreur d'écriture" @@@ -1724,7 -1790,8 +1805,8 @@@ msgstr "Impossible de créer un connecte #: 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." @@@ -1815,45 -1882,86 +1897,83 @@@ msgstr "Impossible de créer de connexio msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossible d'initialiser la connexion à %s: %s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Connexion à %s: %s (%s) impossible." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connexion à %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Ne parvient pas à résoudre « %s »" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Erreur temporaire de résolution de « %s »" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" "Quelque chose d'imprévisible est survenu lors de la détermination de « %s:%" "s » (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Impossible de se connecter à %s %s :" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" -"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Erreur interne : signature correcte, mais il est impossible de déterminer " -"l'empreinte de la clé." + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Au moins une signature non valable a été rencontrée." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Impossible d'exécuter " ++msgstr "Impossible de verrouiller %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr "pour contrôler la signature (veuillez vérifier si gnupg est installé)." ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Erreur inconnue à l'exécution de gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Les signatures suivantes ne sont pas valables :\n" ++msgstr "Les paquets supplémentaires suivants seront installés : " + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Les signatures suivantes n'ont pas pu être vérifiées car la clé publique " -"n'est pas disponible :\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1937,10 -2045,6 +2057,6 @@@ msgstr "Échec de la connexion msgid "Internal error" msgstr "Erreur interne" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Connexion fermée prématurément" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Impossible de mapper un fichier vide en mémoire" @@@ -1955,59 -2059,59 +2071,59 @@@ msgstr "Impossible de réaliser un mappi msgid "Selection %s not found" msgstr "La sélection %s n'a pu être trouvée" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Type d'abréviation non reconnue : « %c »" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Ouverture du fichier de configuration %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "La ligne %d est trop longue (maxi %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erreur syntaxique %s:%u : balise mal formée" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au " "niveau le plus haut" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier" @@@ -2073,7 -2177,7 +2189,7 @@@ msgstr "L'opération %s n'est pas valabl msgid "Unable to stat the mount point %s" msgstr "Impossible de localiser le point de montage %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossible d'accéder à %s" @@@ -2082,70 -2186,70 +2198,70 @@@ msgid "Failed to stat the cdrom" msgstr "Impossible d'accéder au cédérom." - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Verrou non utilisé pour le fichier %s en lecture seule" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Impossible d'ouvrir le fichier verrou %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Impossible de verrouiller %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "A attendu %s mais il n'était pas présent" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Le sous-processus %s a commis une violation d'accès mémoire" - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Le sous-processus %s s'est arrêté prématurément" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Impossible de verrouiller %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "lu(s), %lu restant à lire, mais rien n'est disponible" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problème de fermeture du fichier" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Problème d'effacement du fichier" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" @@@ -2218,18 -2322,18 +2334,28 @@@ msgstr "optionnel msgid "extra" msgstr "supplémentaire" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Construction de l'arbre des dépendances" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versions possibles" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Génération des dépendances" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Fusion des informations disponibles" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Erreur d'écriture du fichier %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2240,55 -2344,59 +2366,59 @@@ msgstr "Impossible de traiter le fichie msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, 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 ++#: apt-pkg/sourcelist.cc:112 #, 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 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ligne %u mal formée dans la liste des sources %s (type)" --#: 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" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %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 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, 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 @@@ -2307,14 -2415,15 +2437,15 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Le type de fichier d'index « %s » n'est pas accepté" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, 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." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2322,38 -2431,50 +2453,51 @@@ msgstr " "Erreur, pkgProblemResolver::Resolve a généré des ruptures, ce qui a pu être " "causé par les paquets devant être gardés en l'état." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problèmes, des paquets défecteux sont en mode " "« garder en l'état »." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Le répertoire %spartial pour les listes n'existe pas." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Le répertoire d'archive %spartial n'existe pas." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Téléchargement du fichier %li de %li (%s restant)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Le pilote pour la méthode %s n'a pu être trouvé." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "La méthode %s n'a pas démarré correctement" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" -"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la " -"touche Entrée." ++"Changement de support : veuillez insérer le disque\n" ++"« %s »\n" ++"dans le lecteur « %s » et appuyez sur la touche Entrée\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Le système de paquet « %s » n'est pas supporté" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Impossible de déterminer un type du système de paquets adéquat" @@@ -2364,7 -2485,8 +2508,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." @@@ -2391,101 -2513,103 +2536,103 @@@ msgstr "Étiquette %s inconnue msgid "No priority (or zero) specified for pin" msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Le cache possède un système de version incompatible" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Erreur apparue lors du traitement de %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vous avez dépassé le nombre de noms de paquets que cet APT est capable de " "traiter." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." - msgstr "Vous avez dépassé le nombre de versions que cet APT est capable de traiter." + msgstr "" + "Vous avez dépassé le nombre de versions que cet APT est capable de traiter." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vous avez dépassé le nombre de dépendances que cet APT est capable de " "traiter." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Erreur apparue lors du traitement de %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des " "fichiers" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossible de localiser la liste des paquets sources %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Assemblage des fichiers listés dans les champs Provides" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 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:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2495,7 -2619,7 +2642,7 @@@ msgstr " "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2504,14 -2628,15 +2651,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:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, 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:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Taille incohérente" @@@ -2520,7 -2645,7 +2668,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2529,68 -2654,68 +2677,68 @@@ msgstr " "Utilisation du point de montage %s pour le cédérom\n" "Montage du cédérom\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identification..." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" -msgstr "Étiquette stockée : %s\n" +msgstr "Étiquette stockée : %s\n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilisation du point de montage %s pour le cédérom\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Démontage du cédérom\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Attente du disque...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Montage du cédérom...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Examen du disque à la recherche de fichiers d'index...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "%i index de paquets trouvés, %i index de sources et %i signatures\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Ce nom n'est pas valable, veuillez recommencer.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Ce disque s'appelle :\n" -"« %s »\n" +"Ce disque s'appelle :\n" +"« %s »\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Copie des listes de paquets..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Écriture de la nouvelle liste de sources\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" -msgstr "Les entrées de listes de sources pour ce disque sont :\n" +msgstr "Les entrées de listes de sources pour ce disque sont :\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Démontage du cédérom..." @@@ -2616,238 -2741,56 +2764,279 @@@ msgstr " "%i enregistrements écrits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Préparation de %s" ++msgstr "Ouverture de %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Décompression de %s" ++msgstr "Ouverture de %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Préparation de la configuration de %s" ++msgstr "Ouverture du fichier de configuration %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Configuration de %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "%s installé" ++msgstr " Installé : " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Préparation de la suppression de %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Suppression de %s" ++msgstr "Ouverture de %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "%s supprimé" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Préparation de la purge de %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "%s purgé" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Connexion fermée prématurément" ++ +#~ msgid "The pkg cache must be initialize first" +#~ msgstr "Le cache des paquets doit être initialisé en premier" + +#~ msgid "Error occured while processing %s (NewPackage)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewPackage)" + +#~ msgid "Error occured while processing %s (UsePackage1)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" + +#~ msgid "Error occured while processing %s (UsePackage2)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" + +#~ msgid "Error occured while processing %s (NewFileVer1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#~ msgid "Error occured while processing %s (NewVersion1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" + +#~ msgid "Error occured while processing %s (UsePackage3)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" + +#~ msgid "Error occured while processing %s (NewVersion2)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" + +#~ msgid "Error occured while processing %s (FindPkg)" +#~ msgstr "Erreur apparue lors du traitement de %s (FindPkg)" + +#~ msgid "Error occured while processing %s (CollectFileProvides)" +#~ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" + +#~ 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é" - diff --combined po/he.po index 8dae868ef,2ca30449f..4a80b9894 --- a/po/he.po +++ b/po/he.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s בשביל %s %s קומפל על %s %s\n" @@@ -192,6 -192,18 +192,18 @@@ msgid " "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "" @@@ -231,7 -243,7 +243,7 @@@ msgid " " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "לא מצליח לכתוב ל-%s" @@@ -240,31 -252,31 +252,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "לא מצליח לקבל את גרסת debconf. האם debconf מותקן?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "שגיאה בעיבוד ספריה %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -306,11 -318,11 +318,11 @@@ " -o=? Set an arbitrary configuration option" msgstr "" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "אין התאמות" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "חלק מהקבצים חסרים בקבוצת קבצי החבילה `%s'" @@@ -343,83 -355,83 +355,83 @@@ msgstr " msgid "Unable to get a cursor" msgstr "" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: לא מצליח לקרוא את הספריה %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: שגיאות תקפות לקובץ" - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "כשלון בפענוח %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "כשלון בפתיחת %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr "" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** כשלון בקישור %s ל-%s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr "" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "המתחזק של %s הוא %s ולא %s\n" @@@ -519,79 -531,79 +531,79 @@@ msgstr " msgid "Failed to rename %s to %s" msgstr "כשלון בשינוי השם %s ל-%s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "לחבילות הבאות יש תלויות שלא נענו:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "אבל %s מותקנת" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "אבל %s הולכת להיות מותקנת" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "אבל היא אינה ניתנת להתקנה" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "אבל היא חבילה וירטואלית" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "אבל היא לא מותקנת" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "אבל היא אינה הולכת להיות מותקנת" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr "או" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "החבילות הבאות יוסרו:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "החבילות הבאות מעובות:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "החבילות הבאות ישודרגו:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "החבילות הבאות ישודרגו מטה:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "החבילות המחוזקות הבאות ישונו:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (בגלל %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -600,123 -612,144 +612,144 @@@ msgstr " "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" "על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu משודרגים, %lu מותקנים חדשים, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu מותקנות מחדש, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu משודרגות מטה, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu יוסרו ו-%lu לא ישודרגו.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu לא מותקנות לחלוטין או הוסרו.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "מתקן תלויות..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr "כשלון." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "לא מצליח לתקן תלויות" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr "סיום" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "החבילות הבאות ישודרגו:" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "" --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + msgid "Internal error, Ordering didn't finish" + msgstr "" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "לא מצליח לנעול את ספרית ההורדה." - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "רשימת המקורות לא ניתנת לקריאה." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "צריך לקבל %sB/%sB מתוך הארכיונים.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "צריך לקבל %sB מתוך הארכיונים.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "אחרי פריסה %sB נוספים ישוחררו.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "אין לך מספיק מקום פנוי ב-%s." + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "אין לך מספיק מקום פנוי ב-%s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "כן, עשה כפי שאני אומר!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -724,75 -757,75 +757,75 @@@ " ?] " msgstr "" - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "בטל." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/n]" - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "כשלון בהבאת %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד." - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -800,79 -833,79 +833,97 @@@ "is only available from another source\n" msgstr "" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1429 ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -880,149 -913,159 +931,155 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" "that package should be filed." msgstr "" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "שגיאה פנימית, כלשון ביצירת %s" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1275,8 -1318,8 +1332,9 @@@ msgstr " msgid "File %s/%s overwrites the one in the package %s" msgstr "" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@@ -1306,9 -1349,9 +1364,9 @@@ msgid "The info and temp directories ne msgstr "" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "" @@@ -1412,39 -1455,45 +1470,45 @@@ msgstr " msgid "Unparsable control file" msgstr "" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "(לא נמצא)" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "" @@@ -1500,7 -1549,7 +1564,7 @@@ msgstr " msgid "Server closed the connection" msgstr "" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "" @@@ -1512,7 -1561,7 +1576,7 @@@ msgstr " msgid "Protocol corruption" msgstr "" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "" @@@ -1613,43 -1662,80 +1677,80 @@@ msgstr " msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + msgid "Could not execute " + msgstr "" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1733,10 -1819,6 +1834,6 @@@ msgstr " msgid "Internal error" msgstr "" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "" @@@ -1751,57 -1833,57 +1848,57 @@@ msgstr " msgid "Selection %s not found" msgstr "" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@@ -1867,7 -1949,7 +1964,7 @@@ msgstr " msgid "Unable to stat the mount point %s" msgstr "" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@@ -1876,70 -1958,70 +1973,70 @@@ msgid "Failed to stat the cdrom" msgstr "" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "" @@@ -2012,18 -2094,18 +2109,27 @@@ msgstr " msgid "extra" msgstr "" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++msgid "Reading state information" ++msgstr "" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "כשלון בפענוח %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2034,52 -2116,52 +2140,52 @@@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" --#: apt-pkg/sourcelist.cc:191 ++#: apt-pkg/sourcelist.cc:244 #, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@@ -2097,48 -2179,58 +2203,58 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "" - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "" - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "" - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2172,82 -2264,82 +2288,82 @@@ msgstr " msgid "No priority (or zero) specified for pin" msgstr "" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "" @@@ -2256,31 -2348,31 +2372,31 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" @@@ -2289,73 -2381,73 +2405,73 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "" - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "" - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "" @@@ -2378,3 -2470,57 +2494,57 @@@ msgstr " #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, c-format + msgid "Preparing %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, c-format + msgid "Unpacking %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, c-format + msgid "Preparing to configure %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr "מותקן:" + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, c-format + msgid "Removing %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "" diff --combined po/hu.po index 5dbebd086,a418bca8d..f865f30b3 --- a/po/hu.po +++ b/po/hu.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-15 18:03+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@@ -150,8 -150,8 +150,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" @@@ -230,6 -230,22 +230,22 @@@ msgstr " " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" "Lásd az apt-cache(8) és apt.conf(5) kézikönyvlapokat további információért.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Kérlek tedd be a(z)\n" + " %s\n" + "címkéjű lemezt a(z) %s meghajtóba és üss entert\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Az argumentumok nincsenek párban" @@@ -291,7 -307,7 +307,7 @@@ msgstr " " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" @@@ -300,31 -316,31 +316,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "A csomagkiterjesztések listája túl hosszú" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Hiba a(z) %s könyvtár feldolgozásakor" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "A forráskiterjesztések listája túl hosszú" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Hiba a tartalom fájl fejlécének írásakor" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Hiba %s tartalmának feldolgozásakor" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -407,11 -423,11 +423,11 @@@ msgstr " " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Nincs illeszkedő kiválasztás" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Néhány fájl hiányzik a(z) '%s' csomagfájl-csoportból" @@@ -444,83 -460,83 +460,83 @@@ msgstr "Az archívumnak nincs vezérlÅ msgid "Unable to get a cursor" msgstr "Nem sikerült egy mutatóhoz jutni" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "F: %s nem érhető el\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "H: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "F: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "H: Hibás a fájl " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Nem sikerült feloldani a következőt: %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Fabejárás nem sikerült" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "%s megnyitása sikertelen" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "readlink nem hajtható végre erre: %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "unlink nem hajtható végre erre: %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s linkelése ehhez: %s sikertelen" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink elérte %sB korlátját.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "%s elérése sikertelen" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" @@@ -620,79 -636,79 +636,79 @@@ msgstr "Probléma %s unlinkelésekor msgid "Failed to rename %s to %s" msgstr "Nem sikerült átnevezni a következőt: %s erre: %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "I" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "A következő csomagoknak teljesítetlen függőségei vannak:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "de az nem telepíthető" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "de az nincs telepítve" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " vagy" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "A következő ÚJ csomagok lesznek telepítve:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "A következő csomagok el lesznek TÁVOLÍTVA:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "A következő csomagok vissza lesznek tartva:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "A következő csomagok frissítve lesznek:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "A következő csomagok VISSZA lesznek fejlesztve:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "A következő visszatartott csomagok fel lesznek váltva:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -701,122 -717,144 +717,144 @@@ msgstr " "FIGYELEM: A következő alapvető csomagok kerülnek eltávolításra\n" "Ezt nem kellene megtenni, kivéve ha pontosan tudod mit csinálsz!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu csomag frissítve lesz, %lu új csomag lesz telepítve, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu újra lesz telepítve, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu vissza lesz fejlesztve, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu el lesz távolítva és %lu nem lesz frissítve.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu csomag nincs teljesen telepítve vagy eltávolítva.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Függőségek javítása..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " sikertelen." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Nem lehet javítani a függőségeket" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Kész" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen függőségek. Próbáld a -f használatával." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "FIGYELMEZTETÉS: A következő csomagok nem hitelesíthetőek!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Telepíti ezeket a csomagokat ellnőrzés nélkül (y/N)? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Belső hiba egy eltérítés hozzáadásakor" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Az archívumokból %sB/%sB-t kell letölteni.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB-t kell letölteni az archívumokból.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Kicsomagolás után %sB lemezterület lesz felhasználva.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Kicsomagolás után %sB lemezterület kerül felszabadításra.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Nincs elég szabad hely itt: %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -827,28 -865,28 +865,28 @@@ msgstr " "A folytatáshoz írd be a következő kifejezést '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Megszakítva." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nem sikerült letölteni a következőt: %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -856,47 -894,47 +894,47 @@@ msgstr " "Nem lehet letölteni néhány archívot, talán próbáld az apt-get update -et " "vagy a --fix-missing -et." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing és a média csere még nem támogatott" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Telepítés megszakítása." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Megjegyzés: %s kiválasztása %s helyett\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "A(z) %s csomag nincs telepítve, így nem távolítható el\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "A(z) %s egy virtuális csomag, amit a következő szolgáltat:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Telepítve]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Egyet határozottan ki kell választanod telepítésre." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -907,49 -945,49 +945,49 @@@ msgstr " "hivatkozik rá. Ez azt jelentheti, hogy a csomag hiányzik, elavult,\n" "vagy csak más forrásból érhető el\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Azonban a következő csomagok felváltják:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "A(z) %s csomagnak nincs jelöltje a telepítéshez" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' kiadás ehhez: '%s' nem található" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' verzió ehhez: '%s' nem található" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -957,26 -995,26 +995,45 @@@ msgstr " "Néhány index fájlt nem sikerült letölteni, ezek mellőzve lesznek, vagy a " "régi változatuk lesz használva." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "A következő információ talán segít megoldani a helyzetet:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Belső hiba, AllUpgrade megsértett valamit" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Nem található a(z) %s csomag" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -984,7 -1022,7 +1041,7 @@@ msgstr " "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül " "(vagy telepítsd a függőségeket is!)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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 -1034,7 +1053,7 @@@ msgstr " "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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,108 -1044,118 +1063,114 @@@ msgstr " "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "A következő információ talán segít megoldani a helyzetet:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Törött csomagok" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "A következő extra csomagok kerülnek telepítésre:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Javasolt csomagok:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Sikertelen" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Kész" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Belső hiba, AllUpgrade megsértett valamit" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrásarchívot kell letölteni.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrásarchívumot kell letölteni.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni " "kell" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függőség információját beszerezni" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1116,7 -1164,7 +1179,7 @@@ msgstr " "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1125,32 -1173,32 +1188,32 @@@ msgstr " "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verziókövetelményt kielégítő elérhető verziója." - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s " - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetőek ki." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Támogatott modulok:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1454,8 -1502,8 +1517,9 @@@ msgstr "Csomagtalálat felülírása % msgid "File %s/%s overwrites the one in the package %s" msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "A(z) %s nem olvasható" @@@ -1485,9 -1533,9 +1549,9 @@@ msgid "The info and temp directories ne msgstr "Az info és temp könyvtáraknak ugyanazon a fájlrendszeren kell lenniük" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Csomaglisták olvasása" @@@ -1595,12 -1643,12 +1659,12 @@@ msgstr "Nem található érvényes vezà msgid "Unparsable control file" msgstr "Értelmezhetetlen vezérlő fájl" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "%s CD-ROM adatbázis nem olvasható" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1608,30 -1656,36 +1672,36 @@@ msgstr " "Kérlek használd az apt-cdrom parancsot a CD felismertetésére. Az apt-get " "update nem használható új CD-k hozzáadására" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Hibás CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Nem lehet leválasztani a(z) %s meghajtóban levő CD-ROM-ot, talán még " "használod." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Nem találom a fájlt" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Nem találom a fájlt" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Nem érhető el" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nem sikerült beállítani a módosítási időt" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Érvénytelen URI, helyi URIk nem kezdődhetnek //-el" @@@ -1689,7 -1743,7 +1759,7 @@@ msgstr "Időtúllépés a kapcsolatban msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Olvasási hiba" @@@ -1701,7 -1755,7 +1771,7 @@@ msgstr "A válasz túlcsordította a pu msgid "Protocol corruption" msgstr "Protokoll hiba" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Írási hiba" @@@ -1803,43 -1857,81 +1873,81 @@@ msgstr "socket létrehozása sikertele msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kapcsolat létrehozása sikertelen a következőhöz: %s: %s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nem lehet kapcsolódni a következőhöz: %s: %s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kapcsolódás a következőhöz: %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Nem lehet feloldani a következőt: '%s' " - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Átmeneti hiba '%s' feloldása közben" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nem lehet kapcsolódni következőhöz: %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Nem sikerült zárolni: %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "A következő extra csomagok kerülnek telepítésre:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1923,10 -2015,6 +2031,6 @@@ msgstr "Kapcsolódás sikertelen msgid "Internal error" msgstr "Belső hiba" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "A kapcsolat idő előtt befejeződött" - # FIXME #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" @@@ -1942,57 -2030,57 +2046,57 @@@ msgstr "Nem sikerült %lu bájtot mmap- msgid "Selection %s not found" msgstr "A(z) %s kiválasztás nem található" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ismeretlen típusrövidítés: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurációs fájl megnyitása" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "A(z) %d. sor túl hosszú (maximum %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik" - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Szintaktikai hiba %s: %u: hibás formátumú címke" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét az érték után" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Szintaktikai hiba %s: %u: Csak legfelső szinten használhatók előírások" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előrás" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén" @@@ -2059,7 -2147,7 +2163,7 @@@ msgstr "%s érvénytelen művelet msgid "Unable to stat the mount point %s" msgstr "%s csatlakoztatási pont nem érhető el" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nem sikerült a következőre váltani: %s" @@@ -2068,70 -2156,70 +2172,70 @@@ msgid "Failed to stat the cdrom" msgstr "Nem sikerült elérni a CD-ROM-ot." - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nem zárolom '%s' csak olvasható zárolási fájlt" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "%s zárolási fájl nem nyitható meg" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nem zárolom '%s' NFS-csatlakoztatású zárolási fájlt" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Nem sikerült zárolni: %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s nem volt itt, ahogy vártam" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s alfolyamat szegmentálási hibát okozott." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s alfolyamat hibakóddal tért vissza (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni %s fájlt" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "olvasás, még kellene %lu, de már az összes elfogyott" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "írás, még kiírandó %lu de ez nem lehetséges" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Probléma a fájl bezárásakor" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Probléma a fájl unlinkelésével" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Probléma a fájl szinkronizálásakor" @@@ -2204,18 -2292,18 +2308,28 @@@ msgstr "opcionális msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Függőségi fa építése" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Lehetséges verziók" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Függőséggenerálás" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Elérhető információk egyesítése" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Nem sikerült a(z) %s fájlba írni" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2226,52 -2314,52 +2340,52 @@@ msgstr "Nem lehet a(z) %s csomagfájlt msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s megnyitása" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú %s forráslistában." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás %s forráslistában (típus)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "A(z) '%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)" @@@ -2292,13 -2380,13 +2406,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "A(z) '%s' indexfájltípus nem támogatott" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "A(z) %s csomagot újra kell telepíteni, de nem találok hozzá archívot." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2306,38 -2394,51 +2420,51 @@@ msgstr " "Hiba, pkgProblemResolver::Resolve sérüléseket generált, ezt visszatartott " "csomagok okozhatják." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "A problémák nem javíthatók, sérült visszatartott csomagok vannak a " "rendszeren." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "%spartial listakönyvtár hiányzik." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "%spartial archívumkönyvtár hiányzik." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "A(z) %s metódus vezérlő nem található." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el helyesen" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Kérlek tedd be a(z)\n" + " %s\n" + "címkéjű lemezt a(z) %s meghajtóba és üss entert\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "A(z) '%s' csomagrendszer nem támogatott" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "A megfelelő csomagrendszer típusa nem határozható meg" @@@ -2373,87 -2474,87 +2500,87 @@@ msgstr "A(z) %s tűtípus nem értelmez msgid "No priority (or zero) specified for pin" msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Ez nem semmi, túllépted a függőségek számát, amit ez az APT kezelni tud." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Hiba adódott a(z) %s feldolgozásakor (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Hiba adódott a(z) %s feldolgozásakor (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" # FIXME --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "\"Előkészít\" kapcsolatok összegyűjtése" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" @@@ -2462,11 -2563,11 +2589,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2475,7 -2576,7 +2602,7 @@@ msgstr " "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot. (hiányzó arch. miatt)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2484,14 -2585,14 +2611,14 @@@ msgstr " "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@@ -2500,7 -2601,7 +2627,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "A(z) %s terjesztő blokk nem tartalmaz ujjlenyomatot" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2509,47 -2610,47 +2636,47 @@@ msgstr " "%s CD-ROM csatlakoztatási pont használata\n" "CD-ROM csatlakoztatása\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Azonosítás.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Tárolt címke: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM csatlakoztatási pont használata\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM leválasztása\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Várakozás a lemezre...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM csatlakoztatása...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Indexfájlok keresése a lemezen...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Ez a név érvénytelen, próbálja újra.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2558,19 -2659,19 +2685,19 @@@ msgstr " "Ezen lemez neve: \n" "%s\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Csomaglisták másolása..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Új forráslista írása\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Ezen lemezhez tartozó forráslista-bejegyzések a következők:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "CD-ROM leválasztása..." @@@ -2593,3 -2694,57 +2720,57 @@@ msgstr "%i rekord kiírva %i hibásan p #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "%s megnyitása" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s megnyitása" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "%s konfigurációs fájl megnyitása" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Kapcsolódás a következőhöz: %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Telepítve: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "%s megnyitása" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Ajánlja" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "A kapcsolat idő előtt befejeződött" diff --combined po/it.po index edb215bbc,cb0f28ec7..5d6a66fd5 --- a/po/it.po +++ b/po/it.po @@@ -5,8 -5,8 +5,8 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-10-05 17:38+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-03-26 00:42+0100\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@@ -146,8 -146,8 +146,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per %s %s compilato il %s %s\n" @@@ -228,6 -228,18 +228,18 @@@ msgstr " "Consultare le pagine del manuale apt-cache(8) e apt.conf(5) per maggiori " "informazioni\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'" + + #: cmdline/apt-cdrom.cc:93 + msgid "Please insert a Disc in the drive and press enter" + msgstr "Inserire un disco nel drive e premere invio" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "Ripetere questo processo per il resto dei CD." + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argomenti non in coppia" @@@ -290,7 -302,7 +302,7 @@@ msgstr " " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Impossibile scrivere in %s" @@@ -299,32 -311,31 +311,32 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Impossibile trovare una versione di debconf. Debconf è installato?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "L'estensione del pacchetto è troppo lunga" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Errore durante l'analisi della directory %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "L'estensione del sorgente è troppo lunga" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Errore nella scrittura dell'header nel file contents" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Errore nell'analisi dei contents %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -390,8 -401,8 +402,8 @@@ msgstr " "dell'albero. BinaryPath deve puntare alla base della ricerca \n" "ricorsiva e il file override devecontenere le opzioni di override. " "Pathprefix è\n" -" aggiunto al campo filename se presente. Esempio di utilizzo \n" -"dall'archivio debian:\n" +" aggiunto al campo filename se presente. Esempio di utilizzo dall'archivio " +"debian:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages \n" "\n" @@@ -406,11 -417,11 +418,11 @@@ " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione arbitraria di configurazione" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Nessuna selezione corrisponde" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mancano alcuni file nel file group di pacchetti `%s'" @@@ -443,83 -454,83 +455,83 @@@ msgstr "L'Archivio non ha un campo cont msgid "Unable to get a cursor" msgstr "Impossibile ottenere un cursore" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossibile leggere la directory %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Impossibile analizzare %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Errori applicati al file " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Impossibile risolvere %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Visita dell'albero fallita" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Impossibile aprire %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Impossibile eseguire readlink su %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Impossibile eseguire unlink su %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Impossibile eseguire link tra %s e %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limite di %sB raggiunto.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Impossibile analizzare %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "L'archivio non ha un campo package" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s non ha un campo override\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantainer è %s non %s\n" @@@ -619,80 -630,79 +631,80 @@@ msgstr "Problema nell'unlink di %s msgid "Failed to rename %s to %s" msgstr "Impossibile rinominare %s in %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione della regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "ma %s è installato" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "ma %s sta per essere installato" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ma non è installabile" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ma non è installato" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " oppure" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@@ -701,157 -711,181 +713,182 @@@ msgstr " "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi (downgraded), " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Correzione delle dipendenze in corso..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " fallita." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Impossibile correggere le dipendenze" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Impossibile minimizzare l'insieme da aggiornare" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Fatto" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "È consigliabile eseguire `apt-get -f install' per correggere questi problemi." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Avviso di autenticazione disabilitato \n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Installare questi pacchetti senza la verifica [s/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Non è stato possibile autenticare alcuni pacchetti" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Sussistono dei problemi e -y è stata usata senza --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 ++#, fuzzy + msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" -"Errore interno, InstallPackages è stato chiamato con un pacchetto rotto!" ++msgstr "Errore interno, InstallPackages Ú stato chiamato con un pacchetto rotto!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "I pacchetti devono essere rimossi ma il remove è disabilitato." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Errore interno, l'ordinamento non è terminato" ++msgstr "Errore interno, l'ordinamento non Ú finito" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non può essere letta." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + "Che strano... le dimensioni non corrispondono, inviare un'email a " + "apt@packages.debian.org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "È necessario prendere %sB/%sB di archivi. \n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "È necessario prendere %sB di archivi. \n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, c-format + msgid "Couldn't determine free space in %s" + msgstr "Impossibile determinare lo spazio libero su %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Lo spazio libero in %s non è sufficente." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "È stata specificata la modalità Trivial Only ma questa non è un'operazione " "triviale" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "SI, esegui come richiesto!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Si sta per compiere un'azione potenzialmente pericolosa\n" +"Si sta per compiere un'azione potenzialmente distruttiva\n" "Per continuare scrivere la frase '%s' \n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Interrotto." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Il download di alcuni file è fallito" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Download completato e in modalità download-only" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -859,102 -893,103 +896,102 @@@ msgstr " "Impossibile prendere alcuni archivi, forse è meglio eseguire apt-get update " "o provare l'opzione --fix-missing" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su media estraibili non è ancora supportato" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Impossibile correggere i pacchetti mancanti" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Interruzione dell'installazione in corso." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, si sta selezionando %s al posto di %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s è stato saltato, perché è già installato e l'aggiornamento non è stato " "impostato.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Il pacchetto %s non è installato, quindi non è stato rimosso\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installato]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Bisogna esplicitamente sceglierne uno da installare." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"Il pacchetto %s non ha versioni disponibili, ma ma è nominato da un " -"altropacchetto.\n" -" Questo significa che il pacchetto manca, è diventato obsoletoo è " -"disponibile solo all'interno di un'altra sorgente\n" +"Il pacchetto %s non ha versioni disponibili, ma .\n" +"Questo significa che il pacchetto è diventato obsoleto oùnè disponibile " +"all'interno da un'altra sorgente\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Comunque il seguente pacchetto lo sostituisce:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Il pacchetto %s non ha candidati da installare" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "La reinstallazione di %s non è possibile, non può esssere scaricato.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s è già alla versione più recente.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non è stata trovata la release '%s' per '%s'" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non è stata trovata la versione '%s' per '%s'" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versione selezionata %s (%s) per %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -962,26 -997,26 +999,45 @@@ msgstr " "Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " "si useranno quelli precedenti." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Errore interno, problem resolver ha rotto qualcosa" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, si sta selezionando %s per la regex '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "È consigliabile eseguire 'apt-get -f install' per correggere questi problemi:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -989,7 -1024,7 +1045,7 @@@ msgstr " "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1001,7 -1036,7 +1057,7 @@@ msgstr " "si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n" "richiesti non sono ancora stati creati o rimossi da incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1011,107 -1046,116 +1067,113 @@@ msgstr " "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pacchetto non integro" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fallito" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Fatto" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Errore interno, problem resolver ha rotto qualcosa" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non è sufficente" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario prendere %sB/%sB di sorgenti.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario prendere %sB di sorgenti\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Non è stato possibile scaricare alcuni archivi." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Si è saltata l'estrazione del sorgente già estratto in %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Verificare se il pacchetto 'dpkg-dev' è installato.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Processo figlio fallito" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Bisogna specificare almeno un pacchetto di cui controllare la generazione di " "dipendenze" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1120,7 -1164,7 +1182,7 @@@ msgstr " "%s dipendenze per %s non possono essere soddisfatte perché non si trova il " "pacchetto %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1129,32 -1173,32 +1191,32 @@@ msgstr " "%s dipendenze per %s non possono essere soddisfatte perché nessuna versione " "del pacchetto %s può soddisfare le richieste di versione" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s " "è troppo nuovo" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s è fallita" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non è stato possibile soddisfare le dipendenze di costruzione per %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione è fallito" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Moduli supportati:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1412,9 -1456,9 +1474,9 @@@ msgid "Duplicate conf file %s/%s msgstr "File di configurazione duplice %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format +#, fuzzy, c-format msgid "Failed to write file %s" -msgstr "Impossibile scrivere il file %s" +msgstr "Scrittura del file %s fallita" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@@ -1469,8 -1513,8 +1531,9 @@@ msgstr "Il pacchetto sovrascritto corri msgid "File %s/%s overwrites the one in the package %s" msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" @@@ -1500,9 -1544,9 +1563,9 @@@ msgid "The info and temp directories ne msgstr "Le directory temp e info devono essere sullo stesso filesystem" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Lettura della lista dei pacchetti in corso" @@@ -1609,12 -1653,12 +1672,12 @@@ msgstr "Impossibile localizzare un fil msgid "Unparsable control file" msgstr "File control non corretto" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Impossibile leggere il database del cdrom %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1622,28 -1666,33 +1685,34 @@@ msgstr " "Si prega di usare apt-cdrom per far riconoscere questo CD-ROM da APT. apt-" "get update non può essere usato per aggiungere nuovi CD-ROM" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD-ROM sbagliato" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Disco non trovato" ++msgstr "File non trovato" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "File non trovato" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Impossibile analizzare" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Impossibile impostare la data di modifica (modification time)" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "URI non valide, le URI locali non devono iniziare con //" @@@ -1701,7 -1750,7 +1770,7 @@@ msgstr "Timeout della connesione msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Errore di lettura" @@@ -1713,7 -1762,7 +1782,7 @@@ msgstr "Una risposta ha superato le dim msgid "Protocol corruption" msgstr "Corruzione nel protocollo" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Errore di scrittura" @@@ -1815,44 -1864,85 +1884,82 @@@ msgstr "Impossibile creare un socket pe msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossibile iniziare la connessione a %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Impossibile connettersi a %s:%s (%s), tempo limite di connessione esaurito" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Impossibile connettersi a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s in corso" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Impossibile risolvere '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "risoluzione di '%s' temporaneamete fallita" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "È accaduto qualcosa di anormale nella risoluzione di '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Impossibile connettersi a %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" -"E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso." + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Errore interno: Firma corretta, ma non è stato possibile determinare il " -"fingerprint della chiave?!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Almeno una firma non valida è stata trovata." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Impossibile eseguire " ++msgstr "Impossibile ottenere il lock %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr " per verificare la firma (gnugp è installato?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Errore sconosciuto durante l'esecuzione di gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Le seguenti firme non erano valide:\n" ++msgstr "I seguenti pacchetti verranno inoltre installati:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Le seguenti firme non sono state verificate perchè la chiave pubblica non è " -"disponibile:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1937,10 -2027,6 +2044,6 @@@ msgstr "Connessione fallita msgid "Internal error" msgstr "Errore interno" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Connessione chiusa prematuramente" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Impossibile eseguire mmap su un file vuoto" @@@ -1955,59 -2041,59 +2058,59 @@@ msgstr "Impossibile eseguire mmap di %l msgid "Selection %s not found" msgstr "Selezione %s non trovata" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo di abbreviazione non riconosciuto: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Apertura del file di configurazione %s in corso" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Linea %d troppo lunga (max %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Errore di sintassi %s:%u: Il blocco inizia senza nome" - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Errore di sintassi %s:%u: Tag malformato" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Errore di sintassi %s:%u: Carattere extra dopo il valore" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Errore di sintassi %s:%u: Le direttive possono essere fatte solo al livello " "più alto" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Errore di sintassi %s:%u: Troppi include annidati" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Errore di sintassi %s:%u: Incluso da qui" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Errore di sintassi %s:%u: Direttiva non supportata '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file" @@@ -2075,7 -2161,7 +2178,7 @@@ msgstr "Operazione non valida %s msgid "Unable to stat the mount point %s" msgstr "Impossibile accedere al mount point %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossibile raggiungere %s" @@@ -2084,70 -2170,70 +2187,70 @@@ msgid "Failed to stat the cdrom" msgstr "Impossibile accedere al cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Locking disabilitato per il file di lock in sola lettura %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Impossibile aprire il file di lock %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lock disabilitato per il file di lock %s nfs montato" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Impossibile ottenere il lock %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa per %s ma non presente" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Il sottoprocesso %s ha ritornato un codice d'errore (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Il sottoprocesso %s è uscito inaspettatamente" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Impossibile aprire il file %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "letto, c'erano ancora %lu da leggere ma non e' stato lasciato nulla" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scrittura, c'erano ancora %lu da scrivere ma non era possibile" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Si è verificato un problema chiudendo il file" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Si è verificato un problema rimuovendo il file" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Si è verificato un problema sincronizzando il file" @@@ -2221,18 -2307,18 +2324,28 @@@ msgstr "opzionale msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Generazione dell'albero delle dipendenze in corso" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versioni candidate" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generazione delle dipendenze" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Aggiornamento delle informazioni disponibili" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Scrittura del file %s fallita" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2243,52 -2329,52 +2356,52 @@@ msgstr "Impossibile analizzare il file msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file dei pacchetti %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "La linea %lu in %s (URI) non è corretta" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "La linea %lu in %s (dist) non è corretta" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "La linea %lu in %s (URI parse) non è corretta" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "La linea %lu nella lista delle fonti %s (Absolute dist) non è corretta" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "La linea %lu in %s (dist parse) non è corretta" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Apertura di %s in corso" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linea %u troppo lunga nel source list %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La linea %u in %s (type) non è corretta" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Il tipo '%s' non è riconosciuto alla linea %u nella lista sorgente %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La linea %u in %s (vendor id) non è corretta" @@@ -2309,7 -2395,7 +2422,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Il file indice di tipo '%s' non è supportato" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2317,7 -2403,7 +2430,7 @@@ msgstr " "Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un " "archivio per esso." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2325,36 -2411,48 +2438,49 @@@ msgstr " "Errore, pkgProblemResolver::Resolve ha generato uno stop, questo può essere " "causato da pacchetti bloccati " --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati" - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Manca la directory di liste %spartial." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Manca la directory di archivio %spartial." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Scaricamento del file %li di %li (%s rimanente)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Non è stato possibile trovare un driver per il metodo %s." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Il metodo %s non è partito correttamente" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" -"Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere " -"invio." ++"Cambio disco: Inserire il disco chiamato\n" ++" '%s'\n" ++"nel dispositivo '%s' e premere invio\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di archiviazione (packaging) '%s' non è supportato" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" @@@ -2389,89 -2487,89 +2515,89 @@@ msgstr "Impossibile capire il tipo di p msgid "No priority (or zero) specified for pin" msgstr "Nessuna (o zero) priorità specificata per il pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "La cache ha un sistema incompatibile di gestione delle versioni" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Errore nell'analisi di %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errore nell'analisi di %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errore nell'analisi di %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errore nell'analisi di %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errore nell'analisi di %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errore nell'analisi di %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errore nell'analisi di %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "WOW, si è ecceduto il numero massimo di nomi di pacchetti che questo APT è " "capace di gestire" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "WOW, si è ecceduto il numero massimo di versioni che questo APT è capace di " "gestire" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "WOW, si è ecceduto il numero massimo di dipendenze che questo APT è capace " "di gestire" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Errore nell'analisi di %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errore nell'analisi di %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "È stato impossibile trovare %s %s mentre si processava le dipendenze dei file" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossibile controllare la lista dei pacchetti sorgente %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Il File Collezionato Fornisce" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvataggio del cache sorgente" @@@ -2480,11 -2578,11 +2606,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2494,7 -2592,7 +2620,7 @@@ msgstr " "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2503,7 -2601,7 +2629,7 @@@ msgstr " "Non è stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2511,7 -2609,7 +2637,7 @@@ msgstr " "I file indice dei pacchetti sono corrotti. Non c'è un campo Filename: per il " "pacchetto %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" @@@ -2520,7 -2618,7 +2646,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Il blocco vendor %s non contiene dati" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2529,47 -2627,47 +2655,47 @@@ msgstr " "Si userà il punto di montaggio del CD-ROM %s\n" "Montaggio CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identificazione in corso.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Etichette salvate: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Si userà il mount point del CD-ROM %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Smontaggio CD-ROM in corso\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "In attesa del disco...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Montaggio CD-ROM in corso \n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Scansione del disco alla ricerca di file indice, in corso..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Trovati %i indici di pacchetto, %i indici di sorgenti e %i firme\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Questo non è un nome valido, riprovare.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2578,19 -2676,19 +2704,19 @@@ msgstr " "Questo disco è chiamato: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Copia della lista dei pacchetti in corso..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Scrittura di una nuova lista sorgenti in corso\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Le voci lista sorgenti per questo Disco sono:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Smontaggio CD-ROM in corso..." @@@ -2614,6 -2712,60 +2740,60 @@@ msgstr "Scritti %i record con %i file s msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Scritti %i record con %i file mancanti e %i file senza match\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Preparazione di %s in corso" ++msgstr "Apertura di %s in corso" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Scompattamento di %s in corso" ++msgstr "Apertura di %s in corso" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Preparazione alla configurazione di %s in corso" ++msgstr "Apertura del file di configurazione %s in corso" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Configurazione di %s in corso" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "%s Installato" ++msgstr " Installato: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Preparazione per la rimozione di %s in corso" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Rimozione di %s in corso" ++msgstr "Apertura di %s in corso" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "%s rimosso" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Preparazione per la rimozione con la configurazione %s in corso" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "Rimosso con la configurazione %s" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Connessione chiusa prematuramente" + #~ msgid "Write Error" #~ msgstr "Errore di Scrittura" @@@ -2643,7 -2795,7 +2823,7 @@@ #~ msgstr "-> '" #~ msgid "Followed conf file from " -#~ msgstr "Si Ú seguito il file di configurazione da " +#~ msgstr "Si Ú seguito il file di configurazione da " #~ msgid " to " #~ msgstr " a " @@@ -2705,9 -2857,6 +2885,6 @@@ #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Impossibile rinominare %s.new in %s" - #~ msgid "Please insert a Disc in the drive and press enter" - #~ msgstr "Inserire un disco nel drive e premere invio" - #~ msgid "I found (binary):" #~ msgstr "Trovati (binary):" @@@ -2722,17 -2871,11 +2899,11 @@@ #~ msgid "" #~ "Unable to locate any package files, perhaps this is not a Debian Disc" -#~ msgstr "Impossibile trovare file di pacchetti, forse questo non Ú un disco Debian" +#~ msgstr "Impossibile trovare file di pacchetti, forse questo non Ú un disco Debian" - #~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" - #~ msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'" - #~ msgid " '" #~ msgstr " '" - #~ msgid "Repeat this process for the rest of the CDs in your set." - #~ msgstr "Ripetere questo processo per il resto dei CD." - #~ msgid "" #~ "Usage: apt-cdrom [options] command\n" #~ "\n" @@@ -2757,22 -2900,22 +2928,22 @@@ #~ msgstr "" #~ "Utilizzo: apt-cdrom [opzioni] comando\n" #~ "\n" -#~ "apt-cdrom Ú un tool per aggiungere CD-ROM alla lista sorgenti di apt. Il\n" +#~ "apt-cdrom Ú un tool per aggiungere CD-ROM alla lista sorgenti di apt. Il\n" #~ "mount point del CDROM e l'informazione della periferica sono presi da apt." #~ "conf\n" #~ "e /etc/fstab.\n" #~ "\n" #~ "Comandi:\n" #~ " add - Aggiunge un CDROM\n" -#~ " ident - riporta l'identità di un CDROM\n" +#~ " ident - riporta l'identità di un CDROM\n" #~ "\n" #~ "Opzioni:\n" #~ " -h Questo help\n" #~ " -d Mount point del CDROM\n" #~ " -r Rinomina un CDROM riconosciuto\n" #~ " -m Nessun montaggio\n" -#~ " -f Modalità veloce, non controlla i file dei pacchetti\n" -#~ " -a Scansione in modalità accurata\n" +#~ " -f Modalità veloce, non controlla i file dei pacchetti\n" +#~ " -a Scansione in modalità accurata\n" #~ " -c=? Legge come configurazione il file specificato\n" #~ " -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n" #~ "Vedere fstab(5)\n" @@@ -2780,28 -2923,11 +2951,11 @@@ #~ msgid "Internal Error, non-zero counts" #~ msgstr "Errore interno, contatori non a zero" - #~ msgid "Internal Error, InstallPackages was called with broken packages!" - #~ msgstr "Errore interno, InstallPackages Ú stato chiamato con un pacchetto rotto!" - - #~ msgid "Internal Error, Ordering didn't finish" - #~ msgstr "Errore interno, l'ordinamento non Ú finito" - - #~ msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" - #~ msgstr "" - #~ "Che strano... le dimensioni non corrispondono, inviare un'email a " - #~ "apt@packages.debian.org" - - #~ msgid "Couldn't determine free space in %s" - #~ msgstr "Impossibile determinare lo spazio libero su %s" - #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" #~ "Spiacente, spazio su disco insufficente in %s per tenere tutti i " #~ "pacchetti." - #~ msgid "Internal Error, problem resolver broke stuff" - #~ msgstr "Errore interno, problem resolver ha rotto qualcosa" - #~ msgid "Couldn't wait for subprocess" #~ msgstr "Impossibile attendere il sottoprocesso" @@@ -2853,7 -2979,7 +3007,7 @@@ #~ " -s=? file override per i sorgenti.\n" #~ " -q silenzioso\n" #~ " -d=? Seleziona il database opzionale per la cache\n" -#~ " -no-delink Abilita la modalità di debug per il delink\n" +#~ " -no-delink Abilita la modalità di debug per il delink\n" #~ " -contents Generazione file contents di controllo\n" #~ " -c=? Legge come configurazione il file specificato\n" #~ " -o=? Imposta un'opzione di configurazione\n" @@@ -2880,7 -3006,7 +3034,7 @@@ #~ msgstr " non " #~ msgid "DSC file '%s' is too large!" -#~ msgstr "il file DSC '%s' Ú troppo largo!" +#~ msgstr "il file DSC '%s' Ú troppo largo!" #~ msgid "Could not find a record in the DSC '%s'" #~ msgstr "Impossibile trovare un campo nel DSC '%s'" diff --combined po/ja.po index acd03c6cc,2632266ea..84c3b1e68 --- a/po/ja.po +++ b/po/ja.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-09 12:54+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@@ -148,8 -148,8 +148,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ¥³¥ó¥Ñ¥¤¥ëÆü»þ: %s %s\n" @@@ -228,6 -228,22 +228,22 @@@ msgstr " " -o=? »ØÄꤷ¤¿ÀßÄꥪ¥×¥·¥ç¥ó¤òÆɤ߹þ¤à (Îã: -o dir::cache=/tmp)\n" "¾ÜºÙ¤Ï¡¢apt-cache(8) ¤ä apt.conf(5) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "¥á¥Ç¥£¥¢Êѹ¹: \n" + " '%s'\n" + "¤È¥é¥Ù¥ë¤ÎÉÕ¤¤¤¿¥Ç¥£¥¹¥¯¤ò¥É¥é¥¤¥Ö '%s' ¤ËÆþ¤ì¤Æ enter ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "°ú¿ô¤¬¥Ú¥¢¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" @@@ -289,7 -305,7 +305,7 @@@ msgstr " " -c=? »ØÄꤷ¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤߤ³¤à\n" " -o=? »ØÄꤷ¤¿ÀßÄꥪ¥×¥·¥ç¥ó¤òŬÍѤ¹¤ë(Îã: -o dir::cache=/tmp)\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó" @@@ -299,31 -315,31 +315,31 @@@ msgid "Cannot get debconf version. Is d msgstr "" "debconf ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£debconf ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¤«?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "¥Ñ¥Ã¥±¡¼¥¸³ÈÄ¥»Ò¥ê¥¹¥È¤¬Ä¹²á¤®¤Þ¤¹" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Î½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "¥½¡¼¥¹³ÈÄ¥»Ò¥ê¥¹¥È¤¬Ä¹²á¤®¤Þ¤¹" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Contents ¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ø¥Ã¥À¤Î½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Contents %s ¤Î½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -405,11 -421,11 +421,11 @@@ msgstr " " -c=? »ØÄê¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤà\n" " -o=? Ǥ°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "ÁªÂò¤Ë¥Þ¥Ã¥Á¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¥°¥ë¡¼¥× `%s' ¤Ë¸«¤¢¤¿¤é¤Ê¤¤¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹" @@@ -442,83 -458,83 +458,83 @@@ msgstr "¥¢¡¼¥«¥¤¥Ö¤ËÀ©¸æ¥ì¥³¡¼¥É¤¬¤¢¤ê¤ msgid "Unable to get a cursor" msgstr "¥«¡¼¥½¥ë¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "·Ù¹ð: ¥Ç¥£¥ì¥¯¥È¥ê %s ¤¬Æɤá¤Þ¤»¤ó\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "·Ù¹ð: %s ¤ò stat ¤Ç¤­¤Þ¤»¤ó\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "¥¨¥é¡¼: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "·Ù¹ð: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "¥¨¥é¡¼: ¥¨¥é¡¼¤¬Å¬ÍѤµ¤ì¤ë¥Õ¥¡¥¤¥ë¤Ï " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "%s ¤Î²ò·è¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "¥Ä¥ê¡¼Æâ¤Ç¤Î°ÜÆ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " ¥ê¥ó¥¯ %s [%s] ¤ò³°¤·¤Þ¤¹\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "%s ¤Î readlink ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "%s ¤Î unlink ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s ¤ò %s ¤Ë¥ê¥ó¥¯¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " ¥ê¥ó¥¯¤ò³°¤¹À©¸Â¤Î %sB ¤ËÅþ㤷¤Þ¤·¤¿¡£\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "%s ¤Î stat ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ë¥Ñ¥Ã¥±¡¼¥¸¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s ¤Ë override ¥¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %1$s ¥á¥ó¥Æ¥Ê¤Ï %3$s ¤Ç¤Ï¤Ê¤¯ %2$s ¤Ç¤¹\n" @@@ -618,79 -634,79 +634,79 @@@ msgstr "%s ¤Î unlink ¤ÇÌäÂ꤬ȯÀ¸¤·¤Þ¤· msgid "Failed to rename %s to %s" msgstr "%s ¤ò %s ¤Ë¥ê¥Í¡¼¥à¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Àµµ¬É½¸½¤ÎŸ³«¥¨¥é¡¼ - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤ÏËþ¤¿¤»¤Ê¤¤°Í¸´Ø·¸¤¬¤¢¤ê¤Þ¤¹:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "¤·¤«¤·¡¢%s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "¤·¤«¤·¡¢%s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "¤·¤«¤·¡¢¤³¤ì¤Ï²¾Áۥѥ屡¼¥¸¤Ç¤¹" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "¤·¤«¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤è¤¦¤È¤·¤Æ¤¤¤Þ¤»¤ó" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ¤Þ¤¿¤Ï" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¿·¤¿¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡Öºï½ü¡×¤µ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÏÊÝᤵ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡Ö¥À¥¦¥ó¥°¥ì¡¼¥É¡×¤µ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "°Ê²¼¤ÎÊѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼¥¸¤ÏÊѹ¹¤µ¤ì¤Þ¤¹:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (%s ¤Î¤¿¤á) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -699,124 -715,146 +715,146 @@@ msgstr " "·Ù¹ð: °Ê²¼¤ÎÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤Þ¤¹\n" "²¿¤ò¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤«¤¬¤Á¤ã¤ó¤È¤ï¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¼Â¹Ô¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É: %lu ¸Ä¡¢¿·µ¬¥¤¥ó¥¹¥È¡¼¥ë: %lu ¸Ä¡¢" --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "ºÆ¥¤¥ó¥¹¥È¡¼¥ë: %lu ¸Ä¡¢" --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "¥À¥¦¥ó¥°¥ì¡¼¥É: %lu ¸Ä¡¢" --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "ºï½ü: %lu ¸Ä¡¢ÊÝα: %lu ¸Ä¡£\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬´°Á´¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Þ¤¿¤Ïºï½ü¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "°Í¸´Ø·¸¤ò²ò·è¤·¤Æ¤¤¤Þ¤¹..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " ¼ºÇÔ¤·¤Þ¤·¤¿¡£" --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "°Í¸´Ø·¸¤òľ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¥»¥Ã¥È¤òºÇ¾®²½¤Ç¤­¤Þ¤»¤ó" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " ´°Î»" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "¤³¤ì¤é¤òľ¤¹¤¿¤á¤Ë¤Ï 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»" "¤ó¡£" --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "̤²ò·è¤Î°Í¸´Ø·¸¤¬¤¢¤ê¤Þ¤¹¡£-f ¥ª¥×¥·¥ç¥ó¤ò»î¤·¤Æ¤¯¤À¤µ¤¤¡£" --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "·Ù¹ð: °Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ïǧ¾Ú¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "¸¡¾Ú¤Ê¤·¤Ë¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤« [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "¤¤¤¯¤Ä¤«¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ç§¾Ú¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "ÌäÂ꤬ȯÀ¸¤·¡¢-y ¥ª¥×¥·¥ç¥ó¤¬ --force-yes ¤Ê¤·¤Ç»ÈÍѤµ¤ì¤Þ¤·¤¿" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢ºï½ü¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "ÆâÉô¥¨¥é¡¼¡¢diversion ¤ÎÄɲÃ" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "¥À¥¦¥ó¥í¡¼¥É¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "¥½¡¼¥¹¤Î¥ê¥¹¥È¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£" - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%2$sB Ãæ %1$sB ¤Î¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB ¤Î¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Ÿ³«¸å¤ËÄÉ²Ã¤Ç %sB ¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬¾ÃÈñ¤µ¤ì¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Ÿ³«¸å¤Ë %sB ¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬²òÊü¤µ¤ì¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only ¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¤¬¡¢¤³¤ì¤Ï´Êñ¤ÊÁàºî¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -827,28 -865,28 +865,28 @@@ msgstr " "³¹Ô¤¹¤ë¤Ë¤Ï¡¢'%s' ¤È¤¤¤¦¥Õ¥ì¡¼¥º¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤¡£\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "ÃæÃǤ·¤Þ¤·¤¿¡£" - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "³¹Ô¤·¤Þ¤¹¤« [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s ¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "¤¤¤¯¤Ä¤«¤Î¥Õ¥¡¥¤¥ë¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "¥À¥¦¥ó¥í¡¼¥É¥ª¥ó¥ê¡¼¥â¡¼¥É¤Ç¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤¬´°Î»¤·¤Þ¤·¤¿" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -856,49 -894,49 +894,49 @@@ msgstr " "¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥«¥¤¥Ö¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£apt-get update ¤ò¼Â¹Ô¤¹¤ë¤« --fix-" "missing ¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤Æ»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ¤È¥á¥Ç¥£¥¢¸ò´¹¤Ï¸½ºßƱ»þ¤Ë¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "­¤ê¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤òľ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤òÃæÃǤ·¤Þ¤¹¡£" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Ãí°Õ¡¢%2$s ¤ÎÂå¤ï¤ê¤Ë %1$s ¤òÁªÂò¤·¤Þ¤¹\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢%s ¤ò¥¹¥­¥Ã¥×" "¤·¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢ºï½ü¤Ï¤Ç¤­¤Þ¤»¤ó\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s ¤Ï°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë²¾Áۥѥ屡¼¥¸¤Ç¤¹:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌÀ¼¨Åª¤ËÁªÂò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -909,49 -947,49 +947,49 @@@ msgstr " "¤ª¤½¤é¤¯¡¢¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«¡¢¤â¤¦¸Å¤¯¤Ê¤Ã¤Æ¤¤¤ë¤«¡¢\n" "¤¢¤ë¤¤¤ÏÊ̤Υ½¡¼¥¹¤«¤é¤Î¤ß¤·¤«ÍøÍѤǤ­¤Ê¤¤¤È¤¤¤¦¾õ¶·¤¬¹Í¤¨¤é¤ì¤Þ¤¹\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "¤·¤«¤·¡¢°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Æ¤¤¤Þ¤¹:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë¤Ï¥¤¥ó¥¹¥È¡¼¥ë¸õÊ䤬¤¢¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "¥À¥¦¥ó¥í¡¼¥É¤¬¤Ç¤­¤Ê¤¤¤¿¤á¡¢%s ¤ÎºÆ¥¤¥ó¥¹¥È¡¼¥ë¤ÏÉÔ²Äǽ¤Ç¤¹¡£\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ¤Ï´û¤ËºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' ¤Î¥ê¥ê¡¼¥¹ '%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' ¤Î¥Ð¡¼¥¸¥ç¥ó '%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s ¤Ë¤Ï¥Ð¡¼¥¸¥ç¥ó %1$s (%2$s) ¤òÁªÂò¤·¤Þ¤·¤¿\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "update ¥³¥Þ¥ó¥É¤Ï°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "list ¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¥Ã¥¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -959,27 -997,27 +997,46 @@@ msgstr " "¤¤¤¯¤Ä¤«¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£Ìµ»ë¤µ¤ì¤¿¤«¡¢¤¢" "¤ë¤¤¤Ï¸Å¤¤¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤·¤¿¡£" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "°Ê²¼¤Î¾ðÊ󤬤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤ËÌòΩ¤Ä¤«¤â¤·¤ì¤Þ¤»¤ó:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ãí°Õ: Àµµ¬É½¸½ '%2$s' ¤ËÂФ·¤Æ %1$s ¤òÁªÂò¤·¤Þ¤·¤¿\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "°Ê²¼¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì" "¤Þ¤»¤ó:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -987,7 -1025,7 +1044,7 @@@ msgstr " "̤²ò·è¤Î°Í¸´Ø·¸¤Ç¤¹¡£'apt-get -f install' ¤ò¼Â¹Ô¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤(¤Þ¤¿¤Ï²òË¡" "¤òÌÀ¼¨¤·¤Æ¤¯¤À¤µ¤¤)¡£" - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -999,7 -1037,7 +1056,7 @@@ msgstr " "Incoming ¤«¤é°ÜÆ°¤µ¤ì¤Æ¤¤¤Ê¤¤¡¢ÉÔ°ÂÄêÈǥǥ£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò»ÈÍѤ·\n" "¤Æ¤¤¤ë¤â¤Î¤È¹Í¤¨¤é¤ì¤Þ¤¹¡£" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1009,107 -1047,117 +1066,113 @@@ msgstr " "²ÄǽÀ­¤¬¹â¤¤¤Ç¤¹¡£¤½¤Î¤¿¤á¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤òÁ÷¤Ã¤Æ¤¯¤À\n" "¤µ¤¤¡£" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "°Ê²¼¤Î¾ðÊ󤬤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤ËÌòΩ¤Ä¤«¤â¤·¤ì¤Þ¤»¤ó:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "°Ê²¼¤ÎÆÃÊ̥ѥ屡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Äó°Æ¥Ñ¥Ã¥±¡¼¥¸:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "¿ä¾©¥Ñ¥Ã¥±¡¼¥¸:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡½Ð¤·¤Æ¤¤¤Þ¤¹... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "¼ºÇÔ" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "´°Î»" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "¥½¡¼¥¹¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¾¯¤Ê¤¯¤È¤â¤Ò¤È¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "%s ¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB Ãæ %1$sB ¤Î¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB ¤Î¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "¥½¡¼¥¹ %s ¤ò¼èÆÀ\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥«¥¤¥Ö¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "¤¹¤Ç¤Ë %s ¤ËŸ³«¤µ¤ì¤¿¥½¡¼¥¹¤¬¤¢¤ë¤¿¤á¡¢Å¸³«¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ÿ³«¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "¥Ó¥ë¥É¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "»Ò¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "builddeps ¤ò¥Á¥§¥Ã¥¯¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¾¯¤Ê¤¯¤È¤â 1 ¤Ä»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s ¤Î build-dependency ¾ðÊó¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s ¤Ë¤Ï build depends ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1118,7 -1166,7 +1181,7 @@@ msgstr " "¥Ñ¥Ã¥±¡¼¥¸ %3$s ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂФ¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È" "¤¬¤Ç¤­¤Þ¤»¤ó" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1127,32 -1175,32 +1190,32 @@@ msgstr " "Æþ¼ê²Äǽ¤Ê %3$s ¤Ï¤¤¤º¤ì¤â¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æ¤ÎÍ×µá¤òËþ¤¿¤»¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂÐ" "¤¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s ¤Î°Í¸´Ø·¸ %1$s ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿ %3$s ¥Ñ¥Ã" "¥±¡¼¥¸¤Ï¿·¤·¤¹¤®¤Þ¤¹" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s ¤Î°Í¸´Ø·¸ %1$s ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %3$s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s ¤Î Build-dependency ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "build dependency ¤Î½èÍý¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1460,8 -1508,8 +1523,9 @@@ msgstr "%s ¤ËÂФ¹¤ë¥Ð¡¼¥¸¥ç¥ó¤Î¤Ê¤¤¥Ñ¥Ã msgid "File %s/%s overwrites the one in the package %s" msgstr "¥Õ¥¡¥¤¥ë %s/%s ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¤â¤Î¤ò¾å½ñ¤­¤·¤Þ¤¹" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s ¤òÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" @@@ -1491,9 -1539,9 +1555,9 @@@ msgid "The info and temp directories ne msgstr "info ¤È temp ¥Ç¥£¥ì¥¯¥È¥ê¤ÏƱ¤¸¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤òÆɤߤ³¤ó¤Ç¤¤¤Þ¤¹" @@@ -1601,12 -1649,12 +1665,12 @@@ msgstr "Àµ¤·¤¤À©¸æ¥Õ¥¡¥¤¥ë¤òÆÃÄê¤Ç¤­¤Þ¤ msgid "Unparsable control file" msgstr "²òÀϤǤ­¤Ê¤¤À©¸æ¥Õ¥¡¥¤¥ë" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "cdrom ¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤òÆɤߤ³¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1614,28 -1662,34 +1678,34 @@@ msgstr " "¤³¤Î CD ¤ò APT ¤Ëǧ¼±¤µ¤»¤ë¤Ë¤Ï apt-cdrom ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£¿·¤·¤¤ CD ¤òÄÉ" "²Ã¤¹¤ë¤¿¤á¤Ë apt-get update ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD ¤¬°ã¤¤¤Þ¤¹" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "%s ¤Î CD-ROM ¤Ï»ÈÍÑÃæ¤Î¤¿¤á¥¢¥ó¥Þ¥¦¥ó¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£" - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "stat ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Êѹ¹»þ¹ï¤ÎÀßÄê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "ÉÔÀµ¤Ê URI ¤Ç¤¹¡£¥í¡¼¥«¥ë¤Î URI ¤Ï // ¤Ç»Ï¤Þ¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£" @@@ -1693,7 -1747,7 +1763,7 @@@ msgstr "Àܳ¥¿¥¤¥à¥¢¥¦¥È msgid "Server closed the connection" msgstr "¥µ¡¼¥Ð¤¬Àܳ¤òÀÚÃǤ·¤Þ¤·¤¿" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Æɤ߹þ¤ß¥¨¥é¡¼" @@@ -1705,7 -1759,7 +1775,7 @@@ msgstr "¥ì¥¹¥Ý¥ó¥¹¤¬¥Ð¥Ã¥Õ¥¡¤ò¥ª¡¼¥Ð¥Õ¥ msgid "Protocol corruption" msgstr "¥×¥í¥È¥³¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "½ñ¤­¹þ¤ß¥¨¥é¡¼" @@@ -1806,43 -1860,81 +1876,81 @@@ msgstr "%s (f=%u t=%u p=%u) ¤ËÂФ¹¤ë¥½¥ msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s) ¤Ø¤ÎÀܳ¤ò³«»Ï¤Ç¤­¤Þ¤»¤ó¡£" - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) ¤ØÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£Àܳ¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "%s:%s (%s) ¤ØÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£" #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s ¤ØÀܳ¤·¤Æ¤¤¤Þ¤¹" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "'%s' ¤ò²ò·è¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' ¤¬°ì»þŪ¤Ë²ò·è¤Ç¤­¤Þ¤»¤ó" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "'%s:%s' (%i) ¤Î²ò·èÃæ¤ËÌäÂ꤬µ¯¤³¤ê¤Þ¤·¤¿" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "%s %s ¤ØÀܳ¤Ç¤­¤Þ¤»¤ó:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "¥í¥Ã¥¯ %s ¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "°Ê²¼¤ÎÆÃÊ̥ѥ屡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1926,10 -2018,6 +2034,6 @@@ msgstr "Àܳ¼ºÇÔ msgid "Internal error" msgstr "ÆâÉô¥¨¥é¡¼" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "ÅÓÃæ¤ÇÀܳ¤¬¥¯¥í¡¼¥º¤µ¤ì¤Þ¤·¤¿" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "¶õ¤Î¥Õ¥¡¥¤¥ë¤ò mmap ¤Ç¤­¤Þ¤»¤ó" @@@ -1944,57 -2032,57 +2048,57 @@@ msgstr "%lu ¥Ð¥¤¥È¤Î mmap ¤¬¤Ç¤­¤Þ¤»¤ó¤ msgid "Selection %s not found" msgstr "ÁªÂò¤µ¤ì¤¿ %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Íý²ò¤Ç¤­¤Ê¤¤¾Êά·Á¼°¤Ç¤¹: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "%d ¹ÔÌܤ¬Ä¹²á¤®¤Þ¤¹ (ºÇÂç¤Ï %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¥Ö¥í¥Ã¥¯¤¬Ì¾Á°¤Ê¤·¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤¹¡£" - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ÉÔÀµ¤Ê¥¿¥°¤Ç¤¹" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "ʸˡ¥¨¥é¡¼ %s:%u: Ãͤθå¤Ë;ʬ¤Ê¥´¥ß¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "ʸˡ¥¨¥é¡¼ %s:%u: Ì¿Îá¤Ï¥È¥Ã¥×¥ì¥Ù¥ë¤Ç¤Î¤ß¼Â¹Ô¤Ç¤­¤Þ¤¹" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¥¤¥ó¥¯¥ë¡¼¥É¤Î¥Í¥¹¥È¤¬Â¿²á¤®¤Þ¤¹" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¤³¤³¤«¤é¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤Æ¤¤¤Þ¤¹" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ̤Âбþ¤ÎÌ¿Îá '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "ʸˡ¥¨¥é¡¼ %s:%u: ¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Ë;·×¤Ê¥´¥ß¤¬¤¢¤ê¤Þ¤¹" @@@ -2060,7 -2148,7 +2164,7 @@@ msgstr "ÉÔÀµ¤ÊÁàºî %s msgid "Unable to stat the mount point %s" msgstr "¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤ò stat ¤Ç¤­¤Þ¤»¤ó" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "%s ¤ØÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" @@@ -2069,70 -2157,70 +2173,70 @@@ msgid "Failed to stat the cdrom" msgstr "cdrom ¤Î stat ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Æɤ߹þ¤ßÀìÍѤΥí¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ë¥í¥Ã¥¯¤Ï»ÈÍѤ·¤Þ¤»¤ó" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs ¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¥í¥Ã¥¯¤ò»ÈÍѤ·¤Þ¤»¤ó" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "¥í¥Ã¥¯ %s ¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s ¤òÂÔ¤Á¤Þ¤·¤¿¤¬¡¢¤½¤³¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "»Ò¥×¥í¥»¥¹ %s ¤¬¥»¥°¥á¥ó¥Æ¡¼¥·¥ç¥ó°ãÈ¿¤ò¼õ¤±¤È¤ê¤Þ¤·¤¿¡£" - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "»Ò¥×¥í¥»¥¹ %s ¤¬¥¨¥é¡¼¥³¡¼¥É (%u) ¤òÊÖ¤·¤Þ¤·¤¿" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "»Ò¥×¥í¥»¥¹ %s ¤¬Í½´ü¤»¤º½ªÎ»¤·¤Þ¤·¤¿" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "Æɤ߹þ¤ß¤¬ %lu »Ä¤Ã¤Æ¤¤¤ë¤Ï¤º¤Ç¤¹¤¬¡¢²¿¤â»Ä¤Ã¤Æ¤¤¤Þ¤»¤ó" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "¤¢¤È %lu ½ñ¤­¹þ¤àɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢½ñ¤­¹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "¥Õ¥¡¥¤¥ë¤Î¥¯¥í¡¼¥º¤ËÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "¥Õ¥¡¥¤¥ë¤Îºï½ü¤ËÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "¥Õ¥¡¥¤¥ë¤Î sync ¤ËÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿" @@@ -2205,18 -2293,18 +2309,28 @@@ msgstr "Ǥ°Õ msgid "extra" msgstr "ÆÃÊÌ" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "°Í¸´Ø·¸¥Ä¥ê¡¼¤òºîÀ®¤·¤Æ¤¤¤Þ¤¹" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "¸õÊä¥Ð¡¼¥¸¥ç¥ó" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "°Í¸´Ø·¸¤ÎÀ¸À®" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Æþ¼ê²Äǽ¾ðÊó¤ò¥Þ¡¼¥¸¤·¤Æ¤¤¤Þ¤¹" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "%s ¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2227,52 -2315,52 +2341,52 @@@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ msgid "Unable to parse package file %s (2)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (URI parse)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (absolute dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (dist parse)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬Ä¹²á¤®¤Þ¤¹¡£" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "¥½¡¼¥¹¥ê¥¹¥È %3$s ¤Î %2$u ¹Ô¤Ë¤¢¤ë¥¿¥¤¥× '%1$s' ¤ÏÉÔÌÀ¤Ç¤¹" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (vendor id)" @@@ -2293,7 -2381,7 +2407,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥× '%s' ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2301,7 -2389,7 +2415,7 @@@ msgstr " "¥Ñ¥Ã¥±¡¼¥¸ %s ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¢¤½¤Î¤¿¤á¤Î¥¢¡¼¥«¥¤¥Ö¤ò¸«" "¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2309,36 -2397,49 +2423,49 @@@ msgstr " "¥¨¥é¡¼¡¢pkgProblemResolver::Resolve ¤ÏÄä»ß¤·¤Þ¤·¤¿¡£¤ª¤½¤é¤¯Êѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼" "¥¸¤¬¸¶°ø¤Ç¤¹¡£" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "ÌäÂê¤ò²ò·è¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£²õ¤ì¤¿Êѹ¹¶Ø»ß¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹¡£" - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "¥ê¥¹¥È¥Ç¥£¥ì¥¯¥È¥ê %spartial ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£" - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "¥¢¡¼¥«¥¤¥Ö¥Ç¥£¥ì¥¯¥È¥ê %spartial ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£" - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "¥á¥½¥Ã¥É¥É¥é¥¤¥Ð %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£" - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "¥á¥½¥Ã¥É %s ¤¬Àµ¾ï¤Ë³«»Ï¤·¤Þ¤»¤ó¤Ç¤·¤¿" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "¥á¥Ç¥£¥¢Êѹ¹: \n" + " '%s'\n" + "¤È¥é¥Ù¥ë¤ÎÉÕ¤¤¤¿¥Ç¥£¥¹¥¯¤ò¥É¥é¥¤¥Ö '%s' ¤ËÆþ¤ì¤Æ enter ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¥·¥¹¥Æ¥à '%s' ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "ŬÀڤʥѥ屡¼¥¸¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó" @@@ -2378,82 -2479,82 +2505,82 @@@ msgstr "pin ¥¿¥¤¥× %s ¤¬Íý²ò¤Ç¤­¤Þ¤»¤ó¤ msgid "No priority (or zero) specified for pin" msgstr "pin ¤ÇÍ¥ÀèÅÙ (¤Þ¤¿¤Ï 0) ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "¥­¥ã¥Ã¥·¥å¤ËÈó¸ß´¹¤Ê¥Ð¡¼¥¸¥ç¥Ë¥ó¥°¥·¥¹¥Æ¥à¤¬¤¢¤ê¤Þ¤¹" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "¤³¤Î APT ¤¬Âбþ¤·¤Æ¤¤¤ë°Ê¾å¤Î¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬»ØÄꤵ¤ì¤Þ¤·¤¿¡£" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "¤³¤Î APT ¤¬Âбþ¤·¤Æ¤¤¤ë°Ê¾å¤Î¿ô¤Î¥Ð¡¼¥¸¥ç¥ó¤¬Í׵ᤵ¤ì¤Þ¤·¤¿¡£" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "¤³¤Î APT ¤¬Âбþ¤·¤Æ¤¤¤ë°Ê¾å¤Î¿ô¤Î°Í¸´Ø·¸¤¬È¯À¸¤·¤Þ¤·¤¿¡£" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s ¤ò½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s %s ¤¬¥Õ¥¡¥¤¥ë°Í¸¤Î½èÍýÃæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È %s ¤¬ stat ¤Ç¤­¤Þ¤»¤ó" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "¥Õ¥¡¥¤¥ëÄ󶡾ðÊó¤ò¼ý½¸¤·¤Æ¤¤¤Þ¤¹" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤ÎÊݸÃæ¤Ë IO ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" @@@ -2462,11 -2563,11 +2589,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "¥ê¥Í¡¼¥à¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£%s (%s -> %s)" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum ¤¬Å¬¹ç¤·¤Þ¤»¤ó" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2475,7 -2576,7 +2602,7 @@@ msgstr " "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°" "¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹ (¸ºß¤·¤Ê¤¤¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¤¿¤á)¡£" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2484,7 -2585,7 +2611,7 @@@ msgstr " "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°" "¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2492,7 -2593,7 +2619,7 @@@ msgstr " "¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë Filename: " "¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "¥µ¥¤¥º¤¬Å¬¹ç¤·¤Þ¤»¤ó" @@@ -2501,7 -2602,7 +2628,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "¥Ù¥ó¥À¥Ö¥í¥Ã¥¯ %s ¤Ï¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2510,49 -2611,49 +2637,49 @@@ msgstr " "CD-ROM ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤ò»ÈÍѤ·¤Þ¤¹\n" "CD-ROM ¤ò¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "³Îǧ¤·¤Æ¤¤¤Þ¤¹.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "³ÊǼ¤µ¤ì¤¿¥é¥Ù¥ë: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤ò»ÈÍѤ·¤Þ¤¹\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "¥Ç¥£¥¹¥¯¤òÂԤäƤ¤¤Þ¤¹...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM ¤ò¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "¥Ç¥£¥¹¥¯¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÁöºº¤·¤Æ¤¤¤Þ¤¹..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" "%i ¤Î¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¡¢%i ¤Î¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¡¢%i ¤Î½ð̾¤ò¸«¤Ä¤±¤Þ¤·" "¤¿\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "¤³¤ì¤ÏÍ­¸ú¤Ê̾Á°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ºÆ»î¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2561,19 -2662,19 +2688,19 @@@ msgstr " "¤³¤Î¥Ç¥£¥¹¥¯¤Ï°Ê²¼¤Î¤è¤¦¤Ë¸Æ¤Ð¤ì¤Þ¤¹: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤ò¥³¥Ô¡¼¤·¤Æ¤¤¤Þ¤¹..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "¿·¤·¤¤¥½¡¼¥¹¥ê¥¹¥È¤ò½ñ¤­¹þ¤ó¤Ç¤¤¤Þ¤¹\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "¤³¤Î¥Ç¥£¥¹¥¯¤Î¥½¡¼¥¹¥ê¥¹¥È¤Î¥¨¥ó¥È¥ê:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "CD-ROM ¤ò¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Æ¤¤¤Þ¤¹..." @@@ -2599,5 -2700,59 +2726,59 @@@ msgstr " "%i ¥ì¥³¡¼¥É¤ò½ñ¤­¹þ¤ß¤Þ¤·¤¿¡£%i ¸Ä¤Î¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤é¤º¡¢%i ¸Ä¤ÎŬ¹ç¤·¤Ê¤¤" "¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹¡£\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "ÀßÄê¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "%s ¤ØÀܳ¤·¤Æ¤¤¤Þ¤¹" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "¿ä¾©" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "ÅÓÃæ¤ÇÀܳ¤¬¥¯¥í¡¼¥º¤µ¤ì¤Þ¤·¤¿" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "¥½¡¼¥¹¥ê¥¹¥È %3$s ¤Î %2$u ¹Ô¤ËÉÔÌÀ¤Ê¥Ù¥ó¥À ID '%1$s' ¤¬¤¢¤ê¤Þ¤¹" diff --combined po/ko.po index ebb80cb0d,38029aae1..a57ca6ff6 --- a/po/ko.po +++ b/po/ko.po @@@ -4,7 -4,7 +4,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@@ -144,8 -144,8 +144,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n" @@@ -224,6 -224,22 +224,22 @@@ msgstr " " -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n" "좀 더 자세한 정보는 apt-cache(8) 및 apt.conf(5) 매뉴얼 페이지를 보십시오.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "미디어 바꾸기: '%2$s' 드라이브에 다음 레이블이 달린\n" + "디스크를 넣고 enter를 누르십시오\n" + " '%1$s'\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "인수가 두 개가 아닙니다" @@@ -285,7 -301,7 +301,7 @@@ msgstr " " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" @@@ -294,31 -310,31 +310,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "꾸러미 확장 목록이 너무 깁니다" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "%s 디렉토리를 처리하는 데 오류가 발생했습니다" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "소스 확장 목록이 너무 깁니다" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "컨텐츠 파일에 헤더를 쓰는 데 오류가 발생했습니다" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "%s 컨텐츠를 처리하는 데 오류가 발생했습니다" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -400,11 -416,11 +416,11 @@@ msgstr " " -c=? 이 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "맞는 꾸러미가 없습니다" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "`%s' 꾸러미 파일 그룹에 몇몇 파일이 빠졌습니다" @@@ -438,84 -454,84 +454,84 @@@ msgstr "아카이브에 컨트롤 ê¸°ë¡ msgid "Unable to get a cursor" msgstr "커서를 가져올 수 없습니다" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "경고: %s 디렉토리를 읽을 수 없습니다\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "경고: %s의 정보를 읽을 수 없습니다\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "오류: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "경고: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "오류: 다음 파일에 적용하는 데 오류가 발생했습니다: " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "%s의 경로를 알아내는 데 실패했습니다" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "트리에서 이동이 실패했습니다" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "%s 파일을 여는 데 실패했습니다" # FIXME: ?? - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " 링크 %s [%s] 없애기\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "%s 파일에 readlink하는 데 실패했습니다" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "%s 파일을 지우는 데 실패했습니다" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s 파일을 %s(으)로 링크하는 데 실패했습니다" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "%s의 정보를 읽는 데 실패했습니다" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "아카이브에 꾸러미 필드가 없습니다" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" @@@ -615,79 -631,79 +631,79 @@@ msgstr "%s의 링크를 해제하는 ë msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "다음 꾸러미의 의존성이 맞지 않습니다:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "하지만 %s 꾸러미를 설치했습니다" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 꾸러미를 설치할 것입니다" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "하지만 가상 꾸러미입니다" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "하지만 %s 꾸러미를 설치하지 않을 것입니다" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " 혹은" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "다음 새 꾸러미를 설치할 것입니다:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "다음 꾸러미를 지울 것입니다:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "다음 꾸러미를 과거 버전으로 유지합니다:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "다음 꾸러미를 업그레이드할 것입니다:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "다음 꾸러미를 다운그레이드할 것입니다:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 꾸러미를 바꿀 것입니다:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -696,126 -712,148 +712,148 @@@ msgstr " "경고: ê¼­ 필요한 다음 꾸러미를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "의존성을 바로잡는 중입니다..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " 실패." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "의존성을 바로잡을 수 없습니다" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "업그레이드 집합을 최소화할 수 없습니다" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " 완료" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "경고: 다음 꾸러미를 인증할 수 없습니다!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "확인하지 않고 꾸러미를 설치하시겠습니까 [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "인증할 수 없는 꾸러미가 있습니다" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "diversion을 추가하는 데 내부 오류" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "내려받기 디렉토리를 잠글 수 없습니다" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%s바이트 아카이브를 받아야 합니다.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "%s에 충분한 공간이 없습니다" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " "아닙니다." # 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -826,28 -864,28 +864,28 @@@ msgstr " "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "중단." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -855,48 -893,48 +893,48 @@@ msgstr " "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" "missing 옵션을 줘서 실행해야 할 것입니다." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "빠진 꾸러미를 바로잡을 수 없습니다." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "설치를 중단합니다." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "주의, %2$s 대신에 %1$s 꾸러미를 선택합니다\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s 꾸러미를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s 꾸러미를 설치하지 않았으므로, 지우지 않습니다\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s 꾸러미는 다음 꾸러미가 제공하는 가상 꾸러미입니다:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [설치함]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "설치하려면 분명하게 하나를 선택해야 합니다." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -907,49 -945,49 +945,49 @@@ msgstr " "해당 꾸러미가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n" "꾸러미를 받아와야 하는 경우일 수도 있습니다.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "하지만 다음 꾸러미가 대체합니다:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "%s 꾸러미는 설치할 수 있는 후보가 없습니다" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s 꾸러미를 다시 설치하는 ê±´ 불가능합니다. 내려 받을 수 없습니다.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 꾸러미는 이미 최신 버전입니다.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s 꾸러미의 '%1$s' 릴리즈를 찾을 수 없습니다" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -957,26 -995,26 +995,45 @@@ msgstr " "일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버" "전을 대신 사용합니다." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "%s 꾸러미를 찾을 수 없습니다" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -984,7 -1022,7 +1041,7 @@@ msgstr " "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -995,7 -1033,7 +1052,7 @@@ msgstr " "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1004,105 -1042,115 +1061,111 @@@ msgstr " "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n" "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "망가진 꾸러미" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "다음 꾸러미를 더 설치할 것입니다:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "실패" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "완료" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 꾸러미를 찾을 수 없습니다" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1111,7 -1159,7 +1174,7 @@@ msgstr " "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" "다" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1120,32 -1168,32 +1183,32 @@@ msgstr " "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너" "무 최근 버전입니다" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "지원하는 모듈:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1450,8 -1498,8 +1513,9 @@@ msgstr "덮어 쓰는 꾸러미가 %s ê msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s 파일은 %s 꾸러미에 있는 파일을 덮어 씁니다" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" @@@ -1481,9 -1529,9 +1545,9 @@@ msgid "The info and temp directories ne msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "꾸러미 목록을 읽는 중입니다" @@@ -1589,12 -1637,12 +1653,12 @@@ msgstr "올바른 control 파일을 ì°¾ msgid "Unparsable control file" msgstr "control 파일을 파싱할 수 없습니다" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "CD-ROM 데이터베이스 %s을(를) 읽을 수 없습니다" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1602,28 -1650,34 +1666,34 @@@ msgstr " "이 CD를 APT에서 인식하려면 apt-cdrom을 사용하십시오. apt-get update로는 새 " "CD를 추가할 수 없습니다." - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "잘못된 CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 것입니다." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "파일이 없습니다" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "파일이 없습니다" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "파일 정보를 읽는 데 실패했습니다" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는 데 실패했습니다" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "URI가 틀렸습니다. 로컬 URI는 //로 시작해야 합니다." @@@ -1681,7 -1735,7 +1751,7 @@@ msgstr "연결 시간 초과 msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "읽기 오류" @@@ -1693,7 -1747,7 +1763,7 @@@ msgstr "응답이 버퍼 크기를 넘ì msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "쓰기 오류" @@@ -1794,43 -1848,81 +1864,81 @@@ msgstr "%s에 대한 소켓을 만들 ì msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "%s:%s에 연결할 수 없습니다 (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "'%s'의 주소를 알아낼 수 없습니다" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s'의 주소를 알아내는 데 임시로 실패했습니다" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생했습니다 (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "%s %s에 연결할 수 없습니다:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "%s 잠금 파일을 얻을 수 없습니다" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "다음 꾸러미를 더 설치할 것입니다:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1914,10 -2006,6 +2022,6 @@@ msgstr "연결이 실패했습니다 msgid "Internal error" msgstr "내부 오류" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "연결이 너무 빨리 끊어졌습니다" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "빈 파일에 mmap할 수 없습니다" @@@ -1932,57 -2020,57 +2036,57 @@@ msgstr "%lu바이트를 mmap할 수 없 msgid "Selection %s not found" msgstr "선택한 %s이(가) 없습니다" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "이 타입 줄임말을 알 수 없습니다: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "설정 파일 %s 파일을 여는 중입니다" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "%d번 줄이 너무 깁니다 (최대 %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "문법 오류 %s:%u: 여기서 include됩니다" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다" @@@ -2048,7 -2136,7 +2152,7 @@@ msgstr "잘못된 작업 %s msgid "Unable to stat the mount point %s" msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "%s 디렉토리로 이동할 수 없습니다" @@@ -2057,70 -2145,70 +2161,70 @@@ msgid "Failed to stat the cdrom" msgstr "CD-ROM의 정보를 읽을 수 없습니다" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "잠금 파일 %s 파일을 열 수 없습니다" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "%s 잠금 파일을 얻을 수 없습니다" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "파일을 닫는 데 문제가 있습니다" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "파일을 지우는 데 문제가 있습니다" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "파일을 동기화하는 데 문제가 있습니다" @@@ -2193,18 -2281,18 +2297,28 @@@ msgstr "옵션 msgid "extra" msgstr "별도" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "의존성 트리를 만드는 중입니다" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "후보 버전" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "의존성 만들기" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "이용 가능 꾸러미 정보를 합칩니다" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "%s 파일을 쓰는 데 실패했습니다" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2215,52 -2303,52 +2329,52 @@@ msgstr "꾸러미 파일 %s 파일을 í msgid "Unable to parse package file %s (2)" msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "소스 리스트 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)" @@@ -2281,14 -2369,14 +2395,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "%s 꾸러미를 다시 설치해야 하지만, 이 꾸러미의 아카이브를 찾을 수 없습니다." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2296,36 -2384,49 +2410,49 @@@ msgstr " "오류, pkgProblemResolver::Resolve가 망가졌습니다, 고정 꾸러미때문에 발생할 수" "도 있습니다." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "목록 디렉토리 %spartial이 빠졌습니다." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "아카이브 디렉토리 %spartial이 빠졌습니다." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "미디어 바꾸기: '%2$s' 드라이브에 다음 레이블이 달린\n" + "디스크를 넣고 enter를 누르십시오\n" + " '%1$s'\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다" @@@ -2359,82 -2460,82 +2486,82 @@@ msgstr "핀 타입 %s이(가0 무엇인 msgid "No priority (or zero) specified for pin" msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "캐시의 버전 시스템이 호환되지 않습니다" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "와우, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "와우, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "와우, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "%s 처리중에 오류가 발생했습니다 (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s 처리중에 오류가 발생했습니다 (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "파일 의존성을 처리하는 데, %s %s 꾸러미가 없습니다" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "소스 꾸러미 목록 %s의 정보를 읽을 수 없습니다" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다" @@@ -2443,11 -2544,11 +2570,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2456,7 -2557,7 +2583,7 @@@ msgstr " "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2465,14 -2566,14 +2592,14 @@@ msgstr " "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@@ -2481,7 -2582,7 +2608,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "벤더 블럭 %s의 핑거프린트가 없습니다" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2490,47 -2591,47 +2617,47 @@@ msgstr " "CD-ROM 마운트 위치로 %s 사용\n" "CD-ROM을 마운트하는 중입니다\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "알아보는 중입니다.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "저장된 레이블: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM 마운트 위치 %s 사용\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM 마운트 해제하는 중입니다\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "디스크를 기다리는 중입니다...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM 마운트하는 중입니다...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "꾸러미 색인 %i개, 소스 색인 %i개, 시그너처 %i개 발견\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2539,19 -2640,19 +2666,19 @@@ msgstr " "이 디스크는 다음과 같습니다: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "꾸러미 목록을 복사하는 중입니다..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "새 소스 리스트를 쓰는 중입니다\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "CD-ROM을 마운트 해제하는 중입니다..." @@@ -2574,3 -2675,57 +2701,57 @@@ msgstr "레코드 %i개를 파일 %i개 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "%s 파일을 여는 중입니다" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s 파일을 여는 중입니다" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "설정 파일 %s 파일을 여는 중입니다" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "%s에 연결하는 중입니다" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " 설치: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "%s 파일을 여는 중입니다" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "추천" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "연결이 너무 빨리 끊어졌습니다" diff --combined po/nb.po index ad66a1e9f,cad2d40c4..5fda21abf --- a/po/nb.po +++ b/po/nb.po @@@ -19,7 -19,7 +19,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@@ -161,8 -161,8 +161,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert på %s %s\n" @@@ -242,6 -242,22 +242,22 @@@ msgstr " " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" "Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Bytte av media: sett inn CD-en som er merket\n" + " «%s»\n" + "i «%s» og trykk «Enter»\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Ikke parvise argumenter" @@@ -304,7 -320,7 +320,7 @@@ msgstr " " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" @@@ -313,31 -329,31 +329,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidelser er for lang" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Feil ved lesing av katalogen %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Lista over kildeutvidelser er for lang" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innholdsfila" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Det oppsto en feil ved lesing av %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -420,11 -436,11 +436,11 @@@ msgstr " " -c=? Les denne oppsettsfila.\n" " -o=? Setter en vilkårlig innstilling" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Ingen utvalg passet" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer mangler i pakkegruppa «%s»" @@@ -457,83 -473,83 +473,83 @@@ msgstr "Arkivet har ingen kontrollpost msgid "Unable to get a cursor" msgstr "Klarte ikke å finne en peker" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Klarte ikke å lese katalogen %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Klarte ikke å få statusen på %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "F:" - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "A:" - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila" - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikke å slå opp %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Klarte ikke å finne fram i treet" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Klarte ikke å åpne %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikke å lese lenken %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikke å oppheve lenken %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikke å lenke %s til %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa på %s B er nådd.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikke å få statusen på %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppføring\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" @@@ -633,79 -649,79 +649,79 @@@ msgstr "Problem ved oppheving av lenke msgid "Failed to rename %s to %s" msgstr "Klarte ikke å endre navnet på %s til %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "men %s er installert" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "men lar seg ikke installere" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "men er ikke installert" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " eller" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -714,123 -730,145 +730,145 @@@ msgstr " "ADVARSEL: Følgende kjernepakker vil bli fjernet\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Retter på avhengighetsforhold ..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " mislyktes." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Klarer ikke å rette på avhengighetsforholdene" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Klarer ikke å minimere oppgraderingsettet" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Utført" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Installer disse pakkene uten verifikasjon [j/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges å fjernes, men funksjonen er slått av." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Det oppsto en intern feil når avledningen ble lagt til" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Må hente %sB/%sB med arkiver.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Må hente %sB med arkiver.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Du har ikke nok ledig plass i %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, gjør som jeg sier!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -841,28 -879,28 +879,28 @@@ msgstr " "For å fortsette, skriv: «%s»\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Avbryter." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -870,48 -908,48 +908,48 @@@ msgstr " "Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller " "«--fix-missing»." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og bytte av media støttes nå ikke" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Klarer ikke å rette på manglende pakker." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Avbryter istallasjonen." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, velger %s istedenfor %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installert]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Du må velge en pakke som skal installeres." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -922,49 -960,49 +960,49 @@@ msgstr " "Dette kan bety at pakken mangler, er utgått, eller bare finnes \n" "tilgjengelig fra en annen kilde.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Følgende pakker erstatter den imidlertid:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installasjonskandidat" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave «%s» av «%s» ble ikke funnet" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon «%s» av «%s» ble ikke funnet" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Kan ikke låse listemappa" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -972,25 -1010,25 +1010,44 @@@ msgstr " "Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle " "ble brukt isteden. " - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Intern feil - «AllUpgrade» ødela noe" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -998,7 -1036,7 +1055,7 @@@ msgstr " "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1010,7 -1048,7 +1067,7 @@@ msgstr " "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1020,112 -1058,122 +1077,118 @@@ msgstr " "at pakken helt enkelt ikke kan installeres, og du bør fylle ut en " "feilmelding." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Ødelagte pakker" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Anbefalte pakker" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislyktes" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Utført" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Intern feil - «AllUpgrade» ødela noe" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Du må angi minst en pakke du vil ha kildekoden til" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Barneprosessen mislyktes" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1134,32 -1182,32 +1197,32 @@@ msgstr " "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken %" "s er for ny" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Støttede moduler:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1466,8 -1514,8 +1529,9 @@@ msgstr "Skriver over pakketreff uten ve msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke å lese %s" @@@ -1498,9 -1546,9 +1562,9 @@@ msgstr " "Infokatalogen og den midlertidige katalogen må være på det samme filsystemet" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Leser pakkelister" @@@ -1608,12 -1656,12 +1672,12 @@@ msgstr "Fant ingen gyldig kontrollfil msgid "Unparsable control file" msgstr "Kontrollfila kan ikke tolkes" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Klarer ikke å lese CD-databasen %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1621,30 -1669,36 +1685,36 @@@ msgstr " "Bruk «apt-cdrom» for å gjøre denne CD-plata tilgjengelig for APT. Du kan " "ikke bruke «apt-get update» til å legge til nye CD-plater." - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Feil CD-plate" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Klarer ikke å avmontere CD-plata i %s. Det kan hende plata fremdeles er i " "bruk." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Fant ikke fila" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fant ikke fila" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Klarte ikke å få status" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig adresse. Lokale adresser kan ikke starte med //" @@@ -1702,7 -1756,7 +1772,7 @@@ msgstr "Tidsavbrudd på forbindelsen msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@@ -1714,7 -1768,7 +1784,7 @@@ msgstr "Et svar oversvømte bufferen. msgid "Protocol corruption" msgstr "Protokollødeleggelse" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@@ -1815,43 -1869,81 +1885,81 @@@ msgstr "Klarte ikke å opprette en sokke msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Klarte ikke å koble til %s:%s (%s), tidsavbrudd på forbindelsen" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Klarte ikke å koble til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikke å slå opp «%s»" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig feil ved oppslag av «%s»" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Klarte ikke å koble til %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Får ikke låst %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Følgende ekstra pakker vil bli installert." + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1935,10 -2027,6 +2043,6 @@@ msgstr "Forbindelsen mislykkes msgid "Internal error" msgstr "Intern feil" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Forbindelsen ble uventet stengt" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Kan ikke utføre mmap på en tom fil" @@@ -1953,57 -2041,57 +2057,57 @@@ msgstr "Kunne ikke lage mmap av %lu byt msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjent typeforkortelse: «%c»" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Åpner oppsettsfila %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Linje %d er for lang (maks %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka starter uten navn." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Feil på taggen" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det øverste nivået" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nøstede inkluderte filer" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herfra" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikke støttet" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila" @@@ -2069,7 -2157,7 +2173,7 @@@ msgstr "Ugyldig operasjon %s msgid "Unable to stat the mount point %s" msgstr "Klarer ikke å fastsette monteringspunktet %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Klarer ikke å endre %s" @@@ -2078,70 -2166,70 +2182,70 @@@ msgid "Failed to stat the cdrom" msgstr "Klarer ikke å få statusen på CD-spilleren" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke åpne låsefila %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Får ikke låst %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet på %s, men den ble ikke funnet" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok et minnefeilsignal." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s ga en feilkode (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke åpne fila %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problem ved låsing av fila" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenke til fila" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@@ -2214,18 -2302,18 +2318,28 @@@ msgstr "valgfri msgid "extra" msgstr "tillegg" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Skaper oversikt over avhengighetsforhold" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versjons-kandidater" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Oppretter avhengighetsforhold" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Fletter tilgjengelig informasjon" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Klarte ikke å skrive fila %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2236,52 -2324,52 +2350,52 @@@ msgstr "Klarer ikke å fortolke pakkefil msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil på linje %lu i kildelista %s (nettadresse)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil på linje %lu i kildelista %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil på %lu i kildelista %s (Absolutt dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil på %lu i kildelista %s (dist fortolking)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Åpner %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil på %u i kildelista %s (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Feil på %u i kildelista %s (selgers id)" @@@ -2302,14 -2390,14 +2416,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Oversiktsfil av typen «%s» støttes ikke" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2317,36 -2405,49 +2431,49 @@@ msgstr " "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " "som holdes tilbake." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listemappa %spartial mangler." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivmappa %spartial mangler." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Finner ikke metode-driveren %s." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startet ikke korrekt" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Bytte av media: sett inn CD-en som er merket\n" + " «%s»\n" + "i «%s» og trykk «Enter»\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» støttes ikke" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Klarer ikke bestemme en passende pakkesystemtype" @@@ -2382,82 -2483,82 +2509,82 @@@ msgstr "Forsto ikke spikring av typen % msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) spesifisert for pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Lageret har et uoverensstemmende versjonssystem" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil oppsto under behandling av %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil oppsto under behandling av %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil oppsto under behandling av %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil oppsto under behandling av %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil oppsto under behandling av %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil oppsto under behandling av %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil oppsto under behandling av %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jøss, du har overgått antallet versjoner denne APT klarer." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil oppsto under behandling av %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil oppsto under behandling av %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" @@@ -2466,11 -2567,11 +2593,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke å endre navnet, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2479,7 -2580,7 +2606,7 @@@ msgstr " "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " "selv (fordi arkitekturen mangler)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2488,13 -2589,13 +2615,13 @@@ msgstr " "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne " "pakken selv." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Feil størrelse" @@@ -2503,7 -2604,7 +2630,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2512,47 -2613,47 +2639,47 @@@ msgstr " "Bruker CD-ROM monteringspunkt %s\n" "Monterer CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Indentifiserer.." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Lagret merkelapp: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruker CD-ROM monteringspunkt %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Venter på CD-en...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Leter gjennom CD for indeksfiler..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldig navn, prøv igjen.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2561,19 -2662,19 +2688,19 @@@ msgstr " "CD-en er kalt: \n" "«%s»\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kopierer pakkelister..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppføringer for denne CD-en er:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Avmonterer CD-ROM..." @@@ -2597,5 -2698,59 +2724,59 @@@ msgstr "Skrev %i poster med %i feile fi msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Åpner %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Åpner %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Åpner oppsettsfila %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Kobler til %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Installert: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Åpner %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Anbefaler" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Forbindelsen ble uventet stengt" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Ukjent selger ID «%s» i linje %u i kildelista %s" diff --combined po/nl.po index 48a2801f4,c5cb71693..27cafaca9 --- a/po/nl.po +++ b/po/nl.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s voor %s %s gecompileerd op %s %s\n" @@@ -228,6 -228,22 +228,22 @@@ msgstr " "\n" "Zie de apt-cache(8) en apt.conf(5) handleidingen voor meer informatie.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Medium wisselen: Gelieve de schijf met label\n" + " '%s'\n" + "in het station '%s' te plaatsen en op 'enter' te drukken\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenten niet in paren" @@@ -290,7 -306,7 +306,7 @@@ msgstr " " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" @@@ -299,31 -315,31 +315,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Pakket-extensielijst is te lang" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Fout bij het verwerken van map %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Bron-extensielijst is te lang" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Fout bij het verwerken van de inhoud van %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -410,11 -426,11 +426,11 @@@ msgstr " " -c=? Lees dit configuratiebestand in\n" " -o=? Stel een willekeurige configuratie optie in" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Er waren geen passende selecties" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'" @@@ -447,83 -463,83 +463,83 @@@ msgstr "Archief heeft geen 'control'-re msgid "Unable to get a cursor" msgstr "Kan geen cursor verkrijgen" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kon map %s niet lezen\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kon de status van %s niet opvragen\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "F: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "F: Er zijn fouten van toepassing op het bestand " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Oplossen van %s is mislukt" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Doorlopen boomstructuur is mislukt" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Openen van %s is mislukt" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " OntlLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Waarde van link %s weergeven is mislukt" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Ontlinken van %s is mislukt" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linken van %s aan %s is mislukt" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB is bereikt.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Status opvragen van %s is mislukt" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" @@@ -623,79 -639,79 +639,79 @@@ msgstr "Probleem bij het ontlinken van msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "maar %s is geïnstalleerd" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal geïnstalleerd worden" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "maar het is niet geïnstalleerd" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "maar het zal niet geïnstalleerd worden" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " of" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (wegens %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -704,123 -720,145 +720,145 @@@ msgstr " "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden\n" "Dit dient NIET gedaan te worden tenzij u echt weet wat u doet!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu nieuwe pakketten geïnstalleerd, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw geïnstalleerd, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu verwijderen en %lu niet opgewaardeerd.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Vereisten worden verbeterd..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " mislukt." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Kan vereisten niet verbeteren" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Kon de verzameling van op te waarderen pakketten niet minimaliseren" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Klaar" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden:" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthenticeerd worden" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Interne fout bij het toevoegen van een omleiding" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Er moeten %sB aan archieven opgehaald worden.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "U heeft niet voldoende vrije schijfruimte op %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "U heeft niet voldoende vrije schijfruimte op %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -831,28 -869,28 +869,28 @@@ msgstr " "Als u wilt doorgaan dient u de zin '%s' in (helemaal) in te tikken.\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Afbreken." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -860,49 -898,49 +898,49 @@@ msgstr " "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Installatie wordt afgebroken." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Let op, %s wordt geselecteerd in plaats van %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet " "gevraagd.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakket %s is een virtueel pakket voorzien door:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Geïnstalleerd]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "U dient er één expliciet te selecteren voor installatie." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -913,50 -951,50 +951,50 @@@ msgstr " "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n" "verouderd is, of enkel beschikbaar is van een andere bron\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Echter, de volgende pakketten vervangen dit:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakket %s heeft geen installeerbare kandidaat" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -964,27 -1002,27 +1002,46 @@@ msgstr " "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " "zijn oudere versies van gebruikt." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "De volgende informatie helpt u mogelijk verder:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -992,7 -1030,7 +1049,7 @@@ msgstr " "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1003,7 -1041,7 +1060,7 @@@ msgstr " "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1013,109 -1051,119 +1070,115 @@@ msgstr " "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "De volgende informatie helpt u mogelijk verder:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Niet-werkende pakketten:" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukt" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Klaar" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald " "moetworden" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Dochterproces is mislukt" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1124,7 -1172,7 +1187,7 @@@ msgstr " "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1133,32 -1181,32 +1196,32 @@@ msgstr " "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Ondersteunde modules:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1474,8 -1522,8 +1537,9 @@@ msgstr "Pakket-overeenkomst wordt overs msgid "File %s/%s overwrites the one in the package %s" msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" @@@ -1506,9 -1554,9 +1570,9 @@@ msgstr " "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" @@@ -1617,12 -1665,12 +1681,12 @@@ msgstr "Localiseren van een geldig 'con msgid "Unparsable control file" msgstr "Niet-ontleedbaar 'control'-bestand" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Kan de cd-rom databank %s niet lezen" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1630,29 -1678,35 +1694,35 @@@ msgstr " "Om deze APT deze CD te laten herkennen kunt u best apt-cdrom gebruiken. 'apt-" "get update' is niet in staat om nieuwe CDs toe te voegen" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Verkeerde CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Kan de CD-ROM in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Bestand niet gevonden" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Bestand niet gevonden" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Status opvragen is mislukt" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Ongeldige URI, lokale URIs mogen niet beginnen met //" @@@ -1710,7 -1764,7 +1780,7 @@@ msgstr "Verbinding is verlopen msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Leesfout" @@@ -1722,7 -1776,7 +1792,7 @@@ msgstr "Een reactie deed de buffer over msgid "Protocol corruption" msgstr "Protocolcorruptie" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Schrijffout" @@@ -1823,43 -1877,81 +1893,81 @@@ msgstr "Kon de socket voor %s (f=%u t=% msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan de verbinding met %s:%s (%s) niet aangaan." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kon niet verbinden met %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Kon '%s' niet vinden" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tijdelijke fout bij het opzoeken van '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kan niet verbinden met %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Kon vergrendeling %s niet verkrijgen" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1946,10 -2038,6 +2054,6 @@@ msgstr "Verbinding mislukt msgid "Internal error" msgstr "Interne fout" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Verbinding werd voortijdig afgebroken" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Kan een leeg bestand niet mmappen" @@@ -1964,59 -2052,59 +2068,59 @@@ msgstr "Kon van %lu bytes geen mmap mak msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Onbekende typeafkorting '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Configuratiebestand %s wordt geopend" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Regel %d is te lang (maxl %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfout %s:%u: Blok start zonder naam." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfout %s:%u: Extra rommel na waarde" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven " "worden" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand" @@@ -2084,7 -2172,7 +2188,7 @@@ msgstr "Ongeldige operatie %s msgid "Unable to stat the mount point %s" msgstr "Kan de status van het aanhechtpunt %s niet opvragen" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kan %s niet veranderen" @@@ -2093,73 -2181,73 +2197,73 @@@ msgid "Failed to stat the cdrom" msgstr "Het opvragen van de CD-status is mislukt" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" "vergrendelingsbestand %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Kon het vergrendelingsbestand '%s' niet openen" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Kon vergrendeling %s niet verkrijgen" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Probleem bij het afsluiten van het bestand" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Probleem bij het ontlinken van het bestand" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@@ -2232,18 -2320,18 +2336,28 @@@ msgstr "optioneel msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Boom van vereisten wordt opgebouwd" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandidaat-versies" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generatie vereisten" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "De beschikbare informatie wordt samengevoegd" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Wegschrijven van bestand %s is mislukt" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2254,52 -2342,52 +2368,52 @@@ msgstr "Kon pakketbestand %s niet ontle msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Type '%s' is onbekend op regel %u in bronlijst %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" @@@ -2321,7 -2409,7 +2435,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indexbestandtype '%s' wordt niet ondersteund" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2329,7 -2417,7 +2443,7 @@@ msgstr " "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " "gevonden worden." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2337,36 -2425,49 +2451,49 @@@ msgstr " "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan " "veroorzaakt worden door vastgehouden pakketten." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt niet-werkende pakketten vast." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Lijstmap %spartial is afwezig." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archiefmap %spartial is afwezig." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Het methodestuurprogramma %s kon niet gevonden worden." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Methode %s startte niet op de juiste manier" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Medium wisselen: Gelieve de schijf met label\n" + " '%s'\n" + "in het station '%s' te plaatsen en op 'enter' te drukken\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" @@@ -2404,84 -2505,84 +2531,84 @@@ msgstr "Pintype %s wordt niet begrepen msgid "No priority (or zero) specified for pin" msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Cache heeft een niet-compatibel versienummeringssysteem" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Fout tijdens verwerken van %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fout tijdens verwerken van %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fout tijdens verwerken van %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fout tijdens verwerken van %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fout tijdens verwerken van %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fout tijdens verwerken van %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fout tijdens verwerken van %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wauw, u heeft meer pakketten dan deze APT aankan." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wauw, u heeft meer versies dan deze APT aankan." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aankan." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fout tijdens verwerken van %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fout tijdens verwerken van %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" @@@ -2490,11 -2591,11 +2617,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2503,7 -2604,7 +2630,7 @@@ msgstr " "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2512,7 -2613,7 +2639,7 @@@ msgstr " "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2520,7 -2621,7 +2647,7 @@@ msgstr " "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@@ -2529,7 -2630,7 +2656,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Verkopersblok %s bevat geen vingerafdruk" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2538,47 -2639,47 +2665,47 @@@ msgstr " "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" "CD wordt aangekoppeld\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identificatie..." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Opgeslagen label: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "CD wordt losgekoppeld\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Er wordt gewacht op de schijf...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "CD wordt aangekoppeld...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Er wordt gescant voor indexbestanden...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "%i pakket-indexen gevonden, %i bron-indexen en %i handtekeningen\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2587,19 -2688,19 +2714,19 @@@ msgstr " "De schijf heet:\n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Pakketlijsten worden gekopieerd..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Nieuwe bronlijst wordt weggeschreven\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "CD wordt afgekoppeld..." @@@ -2625,5 -2726,59 +2752,59 @@@ msgstr " "%i records weggeschreven met %i missende bestanden en %i niet overeenkomende " "bestanden\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "%s wordt geopend" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "%s wordt geopend" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Configuratiebestand %s wordt geopend" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Er wordt verbinding gemaakt met %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Geïnstalleerd: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "%s wordt geopend" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Aanbevelingen" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Verbinding werd voortijdig afgebroken" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Onbekende verkopers-ID '%s' op regel %u in bronlijst %s" diff --combined po/nn.po index 6bd23e0f9,16e47203b..0592a20bd --- a/po/nn.po +++ b/po/nn.po @@@ -9,7 -9,7 +9,7 @@@ msgid " msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Håvard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@@ -150,8 -150,8 +150,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert på %s %s\n" @@@ -230,6 -230,22 +230,22 @@@ msgstr " " -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n" "Du finn meir informasjon på manualsidene apt-cache(8) og apt.conf(5).\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Skifte av medum: Set inn plata merkt\n" + " «%s»\n" + "i stasjonen «%s» og trykk Enter.\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Ikkje parvise argument" @@@ -291,7 -307,7 +307,7 @@@ msgstr " " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" @@@ -300,31 -316,31 +316,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Finn ikkje debconf-versjonen. Er debconf installert?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidingar er for lang" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Feil ved lesing av katalogen %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Lista over kjeldeutvidingar er for lang" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innhaldsfila" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Feil ved lesing av %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -404,11 -420,11 +420,11 @@@ msgstr " " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkårleg innstilling." - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Ingen utval passa" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer manglar i pakkefilgruppa %s" @@@ -441,83 -457,83 +457,83 @@@ msgstr "Arkivet har ingen kontrollpost msgid "Unable to get a cursor" msgstr "Klarte ikkje få peikar" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Å: Klarte ikkje lesa katalogen %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "Å: Klarte ikkje få status til %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "F: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "Å: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikkje slå opp %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Treklatring mislukkast" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Klarte ikkje opna %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikkje lesa lenkja %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikkje oppheva lenkja %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikkje lenkja %s til %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa på %sB er nådd.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikkje få status til %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppføring\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" @@@ -617,79 -633,79 +633,79 @@@ msgstr "Problem ved oppheving av lenkj msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet på %s til %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Følgjande pakkar har krav som ikkje er oppfylte:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "men %s er installert" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "men lèt seg ikkje installera" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "men er ikkje installert" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " eller" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Dei følgjande NYE pakkane vil verta installerte:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Dei følgjande pakkane vil verta FJERNA:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Dei følgjande pakkane er haldne tilbake:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Dei følgjande pakkane vil verta oppgraderte:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -698,124 -714,146 +714,146 @@@ msgstr " "ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n" "Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte på nytt, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Rettar på krav ..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " mislukkast." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Klarte ikkje retta på krav" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Klarte ikkje minimera oppgraderingsmengda" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Ferdig" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prøv med «-f»." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane." - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Installer desse pakkane utan verifikasjon [j/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar må fjernast, men fjerning er slått av." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Intern feil ved tilleggjing av avleiing" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Klarte ikkje låsa nedlastingskatalogen" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Må henta %sB/%sB med arkiv.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Må henta %sB med arkiv.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Du har ikkje nok ledig plass i %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Trivial Only» var spesifisert, men dette er ikkje noka triviell handling." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -826,28 -864,28 +864,28 @@@ msgstr " "For å halda fram, må du skriva nøyaktig «%s».\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Avbryt." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -855,49 -893,49 +893,49 @@@ msgstr " "Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller " "«--fix-missing»." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og byte av medium er ikkje støtta for tida" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Avbryt installasjon." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, vel %s i staden for %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar over %s, for den er installert frå før og ikkje sett til " "oppgradering.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installert]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Du må velja ein som skal installerast." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -908,49 -946,49 +946,49 @@@ msgstr " "av ein annan pakke. Dette tyder at pakket manglar, er gjort overflødig\n" "eller er berre tilgjengeleg frå ei anna kjelde\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Dei følgjande pakkane kan brukast i staden:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Det finst ingen installasjonskandidat for pakken %s" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert frå før.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgåva «%s» av «%s»" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen «%s» av «%s»" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Klarte ikkje låsa listekatalogen" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -958,26 -996,26 +996,45 @@@ msgstr " "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " "filer er brukte i staden." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Intern feil. AllUpgrade øydelagde noko" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade øydelagde noko" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex «%s»\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -985,7 -1023,7 +1042,7 @@@ msgstr " "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja " "ei løysing)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -997,7 -1035,7 +1054,7 @@@ msgstr " "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i «Incoming»." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1007,112 -1045,122 +1064,118 @@@ msgstr " "pakken rett og slett ikkje lèt seg installera. I såfall bør du senda\n" "feilmelding." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Øydelagde pakkar" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Dei følgjande tilleggspakkane vil verta installerte:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Føreslåtte pakkar:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Tilrådde pakkar" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukkast" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Ferdig" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Intern feil. AllUpgrade øydelagde noko" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Må henta %sB med kjeldekodearkiv.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislukkast.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen «%s» mislukkast.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Barneprosessen mislukkast" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1121,31 -1169,31 +1184,31 @@@ msgstr " "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Støtta modular:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1450,8 -1498,8 +1513,9 @@@ msgstr "Skriv over pakketreff utan vers msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" @@@ -1482,9 -1530,9 +1546,9 @@@ msgstr " "Infokatalogen og den mellombelse katalogen må vera på det same filsystemet" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Les pakkelister" @@@ -1592,12 -1640,12 +1656,12 @@@ msgstr "Fann ikkje noka gyldig kontroll msgid "Unparsable control file" msgstr "Kontrollfila kan ikkje tolkast" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Klarte ikkje lesa CD-ROM-databasen %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1605,29 -1653,35 +1669,35 @@@ msgstr " "Bruk «apt-cdrom» for å gjera denne CD-plata tilgjengeleg for APT. Du kan " "ikkje bruka «apt-get update» til å leggja til nye CD-plater." - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Feil CD-plate" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Klarte ikkje montera CD-plata i %s. Det kan henda plata framleis er i bruk." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Fann ikkje fila" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fann ikkje fila" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Klarte ikkje få status" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //" @@@ -1685,7 -1739,7 +1755,7 @@@ msgstr "Tidsavbrot på samband msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@@ -1697,7 -1751,7 +1767,7 @@@ msgstr "Eit svar flaumde over bufferen. msgid "Protocol corruption" msgstr "Protokolløydeleggjing" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@@ -1798,43 -1852,81 +1868,81 @@@ msgstr "Klarte ikkje oppretta sokkel fo msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot på sambandet" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Klarte ikkje kopla til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Koplar til %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikkje slå opp «%s»" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Mellombels feil ved oppslag av «%s»" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Det hende noko dumt ved oppslag av «%s:%s» (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Klarte ikkje kopla til %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Klarte ikkje låsa %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Dei følgjande tilleggspakkane vil verta installerte:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1918,10 -2010,6 +2026,6 @@@ msgstr "Sambandet mislukkast msgid "Internal error" msgstr "Intern feil" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Sambandet vart uventa stengd" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Kan ikkje utføra mmap på ei tom fil" @@@ -1936,57 -2024,57 +2040,57 @@@ msgstr "Klarte ikkje laga mmap av %lu b msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjend typeforkorting: «%c»" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Opnar oppsettsfila %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Linja %d er for lang (maks %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka startar utan namn." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Misforma tagg" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det øvste nivået" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nøsta inkluderte filer" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herifrå" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikkje støtta" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila" @@@ -2052,7 -2140,7 +2156,7 @@@ msgstr "Ugyldig operasjon %s msgid "Unable to stat the mount point %s" msgstr "Klarte ikkje få status til monteringspunktet %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Klarte ikkje byta til %s" @@@ -2061,70 -2149,70 +2165,70 @@@ msgid "Failed to stat the cdrom" msgstr "Klarte ikkje få status til CD-ROM" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brukar ikkje låsing for den skrivebeskytta låsefila %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikkje opna låsefila %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brukar ikkje låsing for den nfs-monterte låsefila %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Klarte ikkje låsa %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta på %s, men den fanst ikkje" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok ein segmenteringsfeil." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s returnerte ein feilkode (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har framleis %lu att å lesa, men ingen att" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har framleis %lu att å skrive, men klarte ikkje" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problem ved låsing av fila" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenkje til fila" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@@ -2197,18 -2285,18 +2301,28 @@@ msgstr "valfri msgid "extra" msgstr "tillegg" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Byggjer kravtre" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandidatversjonar" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Genererer kravforhold" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Flettar informasjon om tilgjengelege pakkar" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Klarte ikkje skriva fila %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2219,52 -2307,52 +2333,52 @@@ msgstr "Klarte ikkje tolka pakkefila % msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Opnar %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)" @@@ -2286,13 -2374,13 +2400,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indeksfiltypen «%s» er ikkje støtta" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Pakken %s må installerast på nytt, men arkivet finst ikkje." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2300,37 -2388,50 +2414,50 @@@ msgstr " "Feil, «pkgProblemResolver::Resolve» har laga brot. Dette kan skuldast pakkar " "som er haldne tilbake." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listekatalogen %spartial manglar." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial manglar." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Finn ikkje metodedrivaren %s." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s starta ikkje rett" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Skifte av medum: Set inn plata merkt\n" + " «%s»\n" + "i stasjonen «%s» og trykk Enter.\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» er ikkje støtta" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" @@@ -2365,82 -2466,82 +2492,82 @@@ msgstr "Skjønar ikkje spikringstypen %s msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) oppgitt for spiker" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil ved behandling av %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil ved behandling av %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil ved behandling av %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil ved behandling av %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil ved behandling av %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil ved behandling av %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil ved behandling av %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jøss, du har overgått talet på pakkenamn som APT kan handtera." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jøss, du har overgått talet på krav som APT kan handtera." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil ved behandling av %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil ved behandling av %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje få status på kjeldepakkelista %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" @@@ -2449,11 -2550,11 +2576,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2462,7 -2563,7 +2589,7 @@@ msgstr " "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv " "(fordi arkitekturen manglar)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2470,14 -2571,14 +2597,14 @@@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er øydelagde. Feltet «Filename:» manglar for pakken %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Feil storleik" @@@ -2486,7 -2587,7 +2613,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2495,47 -2596,47 +2622,47 @@@ msgstr " "Brukar monteringspunktet %s for CD-ROM\n" "Monterer CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identifiserer ... " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Lagra etikett: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Brukar monteringspunktet %s for CD-ROM\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Ventar på disk ...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM ...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Leitar etter indeksfiler på disken ...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Det er ikkje eit gyldig namn, prøv igjen.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2544,19 -2645,19 +2671,19 @@@ msgstr " "Disken vert kalla: \n" "«%s»\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kopierer pakkelister ..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Skriv ny kjeldeliste\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppføringar for denne disken er:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Avmonterer CD-ROM ..." @@@ -2580,5 -2681,59 +2707,59 @@@ msgstr "Skreiv %i postar med %i filer s msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Opnar %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Opnar %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Opnar oppsettsfila %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Koplar til %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Installert: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Opnar %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Tilrådingar" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Sambandet vart uventa stengd" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Ukjend utgjevar-ID «%s» i linja %u i kjeldelista %s" diff --combined po/pl.po index be2659af4,936c6e99c..d48bd09fd --- a/po/pl.po +++ b/po/pl.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-11 11:47+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@@ -148,8 -148,8 +148,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s dla %s %s skompilowany %s %s\n" @@@ -230,6 -230,22 +230,22 @@@ msgstr " "Wiêcej informacji mo¿na znale¼æ na stronach podrêcznika apt-cache(8)\n" "oraz apt.conf(5).\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Zmiana no¶nika: Proszê w³o¿yæ dysk oznaczony\n" + " '%s'\n" + "do napêdu '%s' i nacisn±æ enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenty nie s± w parach" @@@ -291,7 -307,7 +307,7 @@@ msgstr " " -c=? Czytaj ten plik konfiguracyjny.\n" " -o=? Ustaw dowoln± opcjê konfiguracji, np. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Nie uda³o siê pisaæ do %s" @@@ -300,31 -316,31 +316,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nie uda³o siê pobraæ wersji debconf. Czy debconf jest zainstalowany?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Lista rozszerzeñ pakietów jest zbyt d³uga" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "B³±d przetwarzania katalogu %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Lista rozszerzeñ pakietów ¼ród³owych jest zbyt d³uga" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "B³±d przy zapisywaniu nag³ówka do pliku zawarto¶ci" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "B³±d przy przetwarzaniu zawarto¶ci %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -407,11 -423,11 +423,11 @@@ msgstr " " -c=? Czytaj ten plik konfiguracyjny\n" " -o=? Ustaw dowoln± opcjê konfiguracji" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Nie dopasowano ¿adnej nazwy" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Brakuje pewnych plików w grupie plików pakietów `%s'" @@@ -444,83 -460,83 +460,83 @@@ msgstr "Archiwum nie posiada rekordu co msgid "Unable to get a cursor" msgstr "Nie uda³o siê pobraæ kursora" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nie uda³o siê odczytaæ katalogu %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nie mo¿na wykonaæ operacji stat na %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: B³êdy odnosz± siê do pliku " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Nie uda³o siê przet³umaczyæ nazwy %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Przej¶cie po drzewie nie powiod³o siê" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Nie uda³o siê otworzyæ %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " Od³±czenie %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Nie uda³o siê odczytaæ dowi±zania %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Nie uda³o siê usun±æ %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nie uda³o siê dowi±zaæ %s do %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Osi±gniêto ograniczenie od³±czania %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Nie uda³o siê wykonaæ operacji stat na %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archiwum nie posiada³o pola pakietu" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" @@@ -620,79 -636,79 +636,79 @@@ msgstr "Problem przy usuwaniu %s msgid "Failed to rename %s to %s" msgstr "Nie uda³o siê zmieniæ nazwy %s na %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "T" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "B³±d kompilacji wyra¿enia regularnego - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Nastêpuj±ce pakiety maj± niespe³nione zale¿no¶ci:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zostaæ zainstalowany" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ale nie da siê go zainstalowaæ" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " lub" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Zostan± zainstalowane nastêpuj±ce NOWE pakiety:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Nastêpuj±ce pakiety zostan± USUNIÊTE:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Nastêpuj±ce pakiety zosta³y zatrzymane:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Nastêpuj±ce pakiety zostan± zaktualizowane:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Zostan± zainstalowane STARE wersje nastêpuj±cych pakietów:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Zostan± zmienione nastêpuj±ce zatrzymane pakiety:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -701,122 -717,144 +717,144 @@@ msgstr " "UWAGA: Zostan± usuniête nastêpuj±ce istotne pakiety\n" "Nie powinno siê tego robiæ, chyba ¿e dok³adnie wiesz, co robisz!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu przeinstalowywanych, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu cofniêtych wersji, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pe³ni zainstalowanych lub usuniêtych.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Naprawianie zale¿no¶ci..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " nie uda³o siê." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Nie uda³o siê naprawiæ zale¿no¶ci" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Nie uda³o siê zminimalizowaæ zbioru aktualizacji" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Gotowe" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Niespe³nione zale¿no¶ci. Spróbuj u¿yæ -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Nastêpuj±ce pakiety nie mog± zostaæ zweryfikowane!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Zainstalowaæ te pakiety bez weryfikacji [t/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Niektóre pakiety nie mog³y zostaæ zweryfikowane" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "By³y problemy, a u¿yto -y bez --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zostaæ usuniête, ale Remove jest wy³±czone." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "B³±d wewnêtrzny przy dodawaniu objazdu" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Nie uda³o siê zablokowaæ katalogu pobierania" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nie uda³o siê odczytaæ list ¼róde³." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Konieczne pobranie %sB archiwów.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozpakowaniu zostanie dodatkowo u¿yte %sB miejsca na dysku.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Nakazano wykonywaæ tylko trywialne operacje, a to nie jest trywialne." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Tak, rób jak mówiê!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -827,28 -865,28 +865,28 @@@ msgstr " "Aby kontynuowaæ wpisz zdanie '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Przerwane." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowaæ [T/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie uda³o siê pobraæ %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Nie uda³o siê pobraæ niektórych plików" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Ukoñczono pobieranie w trybie samego pobierania" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -856,48 -894,48 +894,48 @@@ msgstr " "Nie uda³o siê pobraæ niektórych archiwów, spróbuj uruchomiæ apt-get update " "lub u¿yæ opcji --fix-missing" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamienianie no¶ników nie jest obecnie obs³ugiwane" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Nie uda³o siê poprawiæ brakuj±cych pakietów." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Przerywanie instalacji" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Uwaga, wybieranie %s zamiast %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Pomijanie %s, jest ju¿ zainstalowane, a nie zosta³o wybrana aktualizacja.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakiet %s nie jest zainstalowany, wiêc nie zostanie usuniêty.\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Zainstalowany]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Nale¿y jednoznacznie wybraæ jeden z nich do instalacji." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -908,50 -946,50 +946,50 @@@ msgstr " "Zazwyczaj oznacza to, ¿e pakietu brakuje, zosta³ zast±piony przez inny\n" "pakiet lub nie jest dostêpny przy pomocy obecnie ustawionych ¼róde³.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Jednak nastêpuj±ce pakiety go zastêpuj±:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakiet %s nie ma kandydata do instalacji" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Przeinstalowanie pakietu %s nie jest mo¿liwe, nie mo¿e on zostaæ pobrany.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s jest ju¿ w najnowszej wersji.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie '%s' dla '%s' nie zosta³o znalezione" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja '%s' dla '%s' nie zosta³a znaleziona" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Wybrano wersjê %s (%s) dla %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga ¿adnych argumentów" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Nie uda³o siê zablokowaæ katalogu list" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -959,25 -997,25 +997,44 @@@ msgstr " "Nie uda³o siê pobraæ niektórych plików indeksu, zosta³y one zignorowane lub " "zosta³a u¿yta ich starsza wersja." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Nie uda³o siê odnale¼æ pakietu %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyra¿enie '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -985,7 -1023,7 +1042,7 @@@ msgstr " "Niespe³nione zale¿no¶ci. Spróbuj 'apt-get -f install' bez pakietów (lub " "podaj rozwi±zanie)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -997,7 -1035,7 +1054,7 @@@ msgstr " "niestabilnej, w której niektóre pakiety nie zosta³y jeszcze utworzone\n" "lub przeniesione z katalogu Incoming (\"Przychodz±ce\")." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1007,110 -1045,120 +1064,116 @@@ msgstr " "danego pakietu po prostu nie da siê zainstalowaæ i nale¿y zg³osiæ w nim\n" "b³±d." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pakiety s± b³êdne" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Zostan± zainstalowane nastêpuj±ce dodatkowe pakiety:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Polecane pakiety:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Nie uda³o siê" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Gotowe" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pobrane " "¼ród³a" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie uda³o siê odnale¼æ ¼ród³a dla pakietu %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów ¼róde³.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów ¼róde³.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz ¼ród³o %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Nie uda³o siê pobraæ niektórych archiwów." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania ju¿ rozpakowanego ¼ród³a w %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiod³o.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiod³o.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Proces potomny zawiód³" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pakiety " "wymagane do budowania" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie uda³o siê pobraæ informacji o zale¿no¶ciach na czas budowania dla %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zale¿no¶ci czasu budowania.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1119,7 -1167,7 +1182,7 @@@ msgstr " "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ nie znaleziono " "pakietu %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1128,32 -1176,32 +1191,32 @@@ msgstr " "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ ¿adna z dostêpnych " "wersji pakietu %s nie ma odpowiedniej wersji" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie uda³o siê spe³niæ zale¿no¶ci %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie uda³o siê spe³niæ zale¿no¶ci %s od %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie uda³o siê spe³niæ zale¿no¶ci na czas budowania od %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Nie uda³o siê przetworzyæ zale¿no¶ci na czas budowania" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Obs³ugiwane modu³y:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1462,8 -1510,8 +1525,9 @@@ msgstr "Dopasowanie dla %s nadpisuj±ceg msgid "File %s/%s overwrites the one in the package %s" msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nie mo¿na czytaæ %s" @@@ -1493,9 -1541,9 +1557,9 @@@ msgid "The info and temp directories ne msgstr "Pliki info i temp musz± byæ na tym samym systemie plików" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Czytanie list pakietów" @@@ -1602,12 -1650,12 +1666,12 @@@ msgstr "Nie uda³o siê odnale¼æ poprawne msgid "Unparsable control file" msgstr "Plik kontrolny nie mo¿e zostaæ poprawnie zinterpretowany" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Nie mo¿na odczytaæ bazy danych CD-ROM-ów %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1615,28 -1663,34 +1679,34 @@@ msgstr " "Proszê u¿yæ programu apt-cdrom, aby APT móg³ rozpoznaæ tê p³ytê CD. Nowych " "p³yt nie mo¿na dodawaæ przy pomocy polecenia apt-get update" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Niew³a¶ciwa p³yta CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nie uda³o siê odmontowaæ CD-ROM-u w %s, byæ mo¿e wci±¿ jest u¿ywany." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Nie odnaleziono pliku" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Nie odnaleziono pliku" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Nie uda³o siê wykonaæ operacji stat" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nie uda³o siê ustawiæ czasu modyfikacji" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Nieprawid³owe URI, lokalne URI nie mog± zaczynaæ siê od //" @@@ -1695,7 -1749,7 +1765,7 @@@ msgstr "Przekroczenie czasu po³±czenia msgid "Server closed the connection" msgstr "Serwer zamkn±³ po³±czenie" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "B³±d odczytu" @@@ -1707,7 -1761,7 +1777,7 @@@ msgstr "Odpowied¼ przepe³ni³a bufor. msgid "Protocol corruption" msgstr "Naruszenie zasad protoko³u" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "B³±d zapisu" @@@ -1808,43 -1862,81 +1878,81 @@@ msgstr "Nie uda³o siê utworzyæ gniazda msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nie uda³o siê zainicjalizowaæ po³±czenia z %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nie uda³o siê po³±czyæ z %s:%s (%s), przekroczenie czasu po³±czenia" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nie uda³o siê po³±czyæ z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "£±czenie z %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Nie uda³o siê przet³umaczyæ nazwy '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tymczasowy b³±d przy t³umaczeniu '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Co¶ niegodziwego sta³o siê przy t³umaczeniu '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nie uda³o siê po³±czyæ z %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Nie uda³o siê uzyskaæ blokady %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Zostan± zainstalowane nastêpuj±ce dodatkowe pakiety:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1928,10 -2020,6 +2036,6 @@@ msgstr "Po³±czenie nie uda³o siê msgid "Internal error" msgstr "B³±d wewnêtrzny" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Po³±czenie zosta³o zamkniête przedwcze¶nie" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Nie mo¿na wykonaæ mmap na pustym pliku" @@@ -1946,58 -2034,58 +2050,58 @@@ msgstr "Nie uda³o siê wykonaæ mmap %lu msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nierozpoznany skrót typu: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Otwieranie pliku konfiguracyjnego %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Linia %d jest zbyt d³uga (max %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "B³±d sk³adniowy %s:%u: Blok nie zaczyna siê nazw±." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "B³±d sk³adniowy %s:%u: B³êdny znacznik" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "B³±d sk³adniowy %s:%u: Po warto¶ci wystêpuj± ¶mieci" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "B³±d sk³adniowy %s:%u: Dyrektywy mog± wystêpowaæ tylko na poziomie najwy¿szym" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "B³±d sk³adniowy %s:%u: Zbyt wiele zagnie¿d¿onych operacji include" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "B³±d sk³adniowy %s:%u: W³±czony tutaj" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "B³±d sk³adniowy %s:%u: Nieobs³ugiwana dyrektywa '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "B³±d sk³adniowy %s:%u: ¦mieci na koñcu pliku" @@@ -2063,7 -2151,7 +2167,7 @@@ msgstr "Nieprawid³owa operacja %s msgid "Unable to stat the mount point %s" msgstr "Nie uda³o siê wykonaæ operacji stat na punkcie montowania %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nie uda³o siê przej¶æ do %s" @@@ -2072,70 -2160,70 +2176,70 @@@ msgid "Failed to stat the cdrom" msgstr "Nie uda³o siê wykonaæ operacji stat na CDROM-ie" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie u¿yta blokada" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Nie uda³o siê otworzyæ pliku blokady %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie u¿yta blokada" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Nie uda³o siê uzyskaæ blokady %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie by³o go" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s spowodowa³ naruszenie segmentacji." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s zwróci³ kod b³êdu (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakoñczy³ siê niespodziewanie" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Nie uda³o siê otworzyæ pliku %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "nale¿a³o przeczytaæ jeszcze %lu, ale nic nie zosta³o" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "nale¿a³o zapisaæ jeszcze %lu, ale nie uda³o siê to" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problem przy zamykaniu pliku" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Problem przy usuwaniu pliku" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@@ -2208,18 -2296,18 +2312,28 @@@ msgstr "opcjonalny msgid "extra" msgstr "dodatkowy" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Budowanie drzewa zale¿no¶ci" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandyduj±ce wersje" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generowanie zale¿no¶ci" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "£±czenie informacji o dostêpnych pakietach" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Nie uda³o siê zapisaæ pliku %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2230,52 -2318,52 +2344,52 @@@ msgstr "Nie uda³o siê zanalizowaæ plik msgid "Unable to parse package file %s (2)" msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (dystrybucja)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (analiza URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (bezwzglêdna dystrybucja)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (analiza dystrybucji)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w li¶cie ¼róde³ %s jest zbyt d³uga." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawid³owa linia %u w li¶cie ¼róde³ %s (typ)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ '%s' jest nieznany - linia %u listy ¼róde³ %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Nieprawid³owa linia %u w li¶cie ¼róde³ %s (identyfikator producenta)" @@@ -2297,14 -2385,14 +2411,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Plik indeksu typu '%s' nie jest obs³ugiwany" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakiet %s ma zostaæ przeinstalowany, ale nie mo¿na znale¼æ jego archiwum." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2312,36 -2400,49 +2426,49 @@@ msgstr " "B³±d, pkgProblemResolver::Resolve zwróci³ b³±d, mo¿e to byæ spowodowane " "\"zatrzymanymi\" pakietami." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Nie uda³o siê naprawiæ problemów, zatrzyma³e¶/³a¶ uszkodzone pakiety." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Brakuje katalogu list %spartial." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Brakuje katalogu archiwów %spartial." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Nie uda³o siê odnale¼æ sterownika metody %s." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nie uruchomi³a siê poprawnie." - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Zmiana no¶nika: Proszê w³o¿yæ dysk oznaczony\n" + " '%s'\n" + "do napêdu '%s' i nacisn±æ enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietów '%s' nie jest obs³ugiwany" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nie uda³o siê okre¶liæ odpowiedniego typu systemu pakietów" @@@ -2375,87 -2476,87 +2502,87 @@@ msgstr "Nierozpoznany typ przypinania % msgid "No priority (or zero) specified for pin" msgstr "Brak (lub zerowy) priorytet przypiêcia" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Magazyn podrêczny ma niezgodny system wersji" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Och, przekroczy³e¶/³a¶ liczbê pakietów, któr± ten APT jest w stanie obs³u¿yæ." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Och, przekroczy³e¶/³a¶ liczbê wersji, któr± ten APT jest w stanie obs³u¿yæ." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Och, przekroczy³e¶/³a¶ liczbê zale¿no¶ci, któr± ten APT jest w stanie " "obs³u¿yæ." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Wyst±pi³ b³±d przy przetwarzaniu %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie zosta³ odnaleziony przy przetwarzaniu zale¿no¶ci plików" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie uda³o siê wykonaæ operacji stat na li¶cie pakietów ¼ród³owych %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Zbieranie zapewnieñ plików" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "B³±d wej¶cia/wyj¶cia przy zapisywaniu podrêcznego magazynu ¼róde³" @@@ -2464,11 -2565,11 +2591,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "nie uda³o siê zmieniæ nazwy, %s (%s -> %s)" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "B³êdna suma MD5" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2477,7 -2578,7 +2604,7 @@@ msgstr " "Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba " "bêdzie rêcznie naprawiæ ten pakiet (z powodu brakuj±cej architektury)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2486,14 -2587,14 +2613,14 @@@ msgstr " "Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba " "bêdzie rêcznie naprawiæ ten pakiet." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów s± uszkodzone. Brak pola Filename: dla pakietu %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "B³êdny rozmiar" @@@ -2502,7 -2603,7 +2629,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Blok producenta %s nie zawiera odcisku" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2511,48 -2612,48 +2638,48 @@@ msgstr " "Wykorzystuê %s jako punkt montowania CD-ROMu\n" "Montowanie CD-ROMu\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identyfikacja.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Etykieta: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Wykorzystujê %s jako punkt montowania CD-ROMu\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Odmontowanie CD-ROMu\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Oczekiwanie na p³ytê...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Montowanie CD-ROMu...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Skawnowanie p³yty w poszukiwaniu plików indeksu..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" "Znaleziono %i indeksów pakietów, %i indeksów ¼ród³owych i %i sygnatur\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "To nie jest prawid³owa nazwa, spróbuj ponownie.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2561,19 -2662,19 +2688,19 @@@ msgstr " "P³yta nosi nazwê: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kopiowanie list pakietów..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Zapisywanie nowej listy ¼róde³\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "¬ród³a dla tej p³yty to:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Odmontowanie CD-ROMu..." @@@ -2596,3 -2697,57 +2723,57 @@@ msgstr "Zapisano %i rekordów z %i niepa #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordów z %i brakuj±cymi plikami i %i niepasuj±cymi\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Otwieranie %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Otwieranie %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Otwieranie pliku konfiguracyjnego %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "£±czenie z %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Zainstalowana: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Otwieranie %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Poleca" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Po³±czenie zosta³o zamkniête przedwcze¶nie" diff --combined po/pt.po index 84bc5b49d,68a6d730a..26045ff17 --- a/po/pt.po +++ b/po/pt.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 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" @@@ -227,6 -227,21 +227,21 @@@ msgstr " " -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" "Veja as páginas do manual apt-cache(8) e apt.conf(5) para mais informações.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Troca de mídia: Por favor insira o disco nomeado '%s' no drive '%s' e " + "pressione enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumentos não estão em pares" @@@ -289,7 -304,7 +304,7 @@@ msgstr " " -c=? Ler este arquivo de configuração\n" " -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" @@@ -298,31 -313,31 +313,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Lista de extensão de pacotes é demasiado longa" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Erro processando o directório %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Lista de extensão de fontes é demasiado longa" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Erro ao gravar cabeçalho no ficheiro de conteúdo" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Erro processando o ficheiro Contents %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -403,11 -418,11 +418,11 @@@ msgstr " " -c=? Lê este ficheiro de configuração\n" " -o=? Define uma opção de configuração arbitrária" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Nenhuma selecção coincidiu" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Alguns ficheiros faltam no ficheiro de grupo de pacotes `%s'" @@@ -440,83 -455,83 +455,83 @@@ msgstr "O arquivo não tem registro de msgid "Unable to get a cursor" msgstr "Não foi possível obter um cursor" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Não foi possível ler o directório %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Não foi possível fazer stat %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Erros aplicam-se ao ficheiro " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Falha ao resolver %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Falhou ao percorrer a árvore" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Falhou ao abrir %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Falhou ao executar readlink %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Falhou ao executar unlink %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Falhou ao ligar %s a %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Falha ao executar stat %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arquivo não possuía campo pacote" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " maintainer de %s é %s, não %s\n" @@@ -616,79 -631,79 +631,79 @@@ msgstr "Problema ao executar unlinking msgid "Failed to rename %s to %s" msgstr "Falha ao renomear %s para %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "mas não está instalável" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "mas não está instalado" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ou" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Os seguintes NOVOS pacotes serão instalados:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Os seguintes pacotes serão REMOVIDOS:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Os seguintes pacotes serão mantidos em suas versões actuais:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Os seguintes pacotes serão actualizados:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Aos seguintes pacotes será feito o DOWNGRADE :" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados :" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -698,123 -713,145 +713,145 @@@ msgstr " "Isso NÃO deve ser feito a menos que você saiba exactamente o que está a " "fazer!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " falhou." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de actualizações" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Feito" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer executar `apt-get -f install' para corrigir isso." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os seguintes pacotes não podem ser autenticados" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não poderam ser autenticados" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Erro Interno ao adicionar um desvio" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: 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." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É necessário fazer o download de %sB de arquivos.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Depois descompactar, %sB adicionais de espaço em disco serão utilizados.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Desculpe, você não tem espaço suficiente em %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço livre suficiente em %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas essa não é uma operação trivial." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -825,28 -862,28 +862,28 @@@ msgstr " "Para continuar escreva a frase '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abortado." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -854,47 -891,47 +891,47 @@@ msgstr " "Impossível obter alguns arquivos, execute talvez apt-get update ou tente com " "--fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Impossível corrigir os pacotes em falta." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Abortando a Instalação." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s em vez de %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, já está instalado e a actualização não está definida.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual disponibilizado por:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instalado]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Você deve selecionar explicitamente um para instalar." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -905,51 -942,51 +942,51 @@@ msgstr " "Isso pode significar que o pacote falta, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "No entanto, os seguintes pacotes substituem-o:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais recente.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrado" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no directório de listas" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -957,25 -994,25 +994,44 @@@ msgstr " "Falhou o download de alguns ficheiros de índice, foram ignorados ou os " "antigos foram usados em seu lugar." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "A seguinte informação pode ajudar a resolver a situação:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Erro Interno, AllUpgrade quebrou as coisas" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para a expressão regular '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -983,7 -1020,7 +1039,7 @@@ msgstr " "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -995,7 -1032,7 +1051,7 @@@ msgstr " "distribuição instável, que alguns pacotes requesitados ainda não foram \n" "criados ou foram tirados do Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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,109 -1043,119 +1062,115 @@@ msgstr " "de\n" "bug sobre esse pacote." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "A seguinte informação pode ajudar a resolver a situação:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pacotes estragados" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Pacotes recomendados :" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calculando Actualização... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Pronto" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Erro Interno, AllUpgrade quebrou as coisas" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Deve-se especificar pelo menos um pacote para que se obtenha o código fonte" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote de código fonte para %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos de código fonte.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Falha ao obter alguns arquivos." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Saltando a descompactação de pacote código fonte já descompactado em %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "O processo filho falhou" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível obter informações de dependências de compilação para %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1117,7 -1164,7 +1179,7 @@@ msgstr " "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1126,32 -1173,32 +1188,32 @@@ msgstr " "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requesitos de versão" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de compilação" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Módulos Suportados:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1461,8 -1508,8 +1523,9 @@@ msgstr "Sobreescrita de pacote não coi msgid "File %s/%s overwrites the one in the package %s" msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@@ -1492,9 -1539,9 +1555,9 @@@ msgid "The info and temp directories ne msgstr "Os directórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "A Ler Listas de Pacotes" @@@ -1601,12 -1648,12 +1664,12 @@@ msgstr "Falha em localizar um ficheiro msgid "Unparsable control file" msgstr "Ficheiro de controle não interpretável" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Impossível ler a base de dados de cdrom %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1614,28 -1661,34 +1677,34 @@@ msgstr " "Por favor utilize o apt-cdrom para fazer com que este CD seja reconhecido " "pelo APT. apt-get update não pode ser utilizado para adicionar novos CDs" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD errado" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Arquivo não encontrado" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Arquivo não encontrado" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Falha ao executar stat" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificação" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválido, URIs locais não devem iniciar com //" @@@ -1693,7 -1746,7 +1762,7 @@@ msgstr "Tempo limite de ligação ating msgid "Server closed the connection" msgstr "Servidor fechou a ligação" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@@ -1705,7 -1758,7 +1774,7 @@@ msgstr "Uma resposta sobrecarregou o bu msgid "Protocol corruption" msgstr "Corrupção de protocolo" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escrita" @@@ -1806,43 -1859,81 +1875,81 @@@ msgstr "Não foi possível criar um soc msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Não posso iniciar a ligação para %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Não foi possível ligarar em %s:%s (%s), a conexão expirou" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Não foi possível ligar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ligando a %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Não foi possível resolver '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Falha temporária resolvendo '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Impossível ligar a %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Não foi possível obter lock %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Os seguintes pacotes extra serão instalados:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1926,10 -2017,6 +2033,6 @@@ msgstr "Falhou a ligação msgid "Internal error" msgstr "Erro interno" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Conexão encerrada prematuramente" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Não é possível fazer mmap a um ficheiro vazio" @@@ -1944,58 -2031,58 +2047,58 @@@ msgstr "Impossível fazer mmap de %lu b msgid "Selection %s not found" msgstr "Selecção %s não encontrada" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo desconhecida: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo ficheiro de configuração %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Linha %d é demasiado longa (max %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag Malformada" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Muitos includes encadeados" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro" @@@ -2062,7 -2149,7 +2165,7 @@@ msgstr "Operação %s inválida msgid "Unable to stat the mount point %s" msgstr "Impossível executar stat ao ponto de montagem %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@@ -2071,70 -2158,70 +2174,70 @@@ msgid "Failed to stat the cdrom" msgstr "Impossível executar stat ao cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Não utilizando locking para ficheiro lock apenas de leitura %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir ficheiro de lock %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Não usando locking para ficheiro de lock montado via nfs %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter lock %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou, por %s mas não estava lá" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas não resta nenhum" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "gravação, ainda restam %lu para gravar mas não foi possível" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problema ao fechar o ficheiro" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Problema removendo o link ao ficheiro" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@@ -2207,18 -2294,18 +2310,28 @@@ msgstr "opcional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Construindo Árvore de Dependências" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versões Candidatas" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Geração de Dependência" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Juntando informação Disponível" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Falha ao escrever ficheiro %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2229,52 -2316,52 +2342,52 @@@ msgstr "Impossível o parse ao ficheir msgid "Unable to parse package file %s (2)" msgstr "Impossível o parse ao ficheiro de pacote %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu na lista de fontes %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu na lista de fontes %s (distribuição)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu na lista de fontes %s (Distribuição absoluta)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu na lista de fontes %s (dist parse)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abrindo %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u na lista de fontes %s (tipo)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" @@@ -2296,7 -2383,7 +2409,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Tipo do ficheiro de índice '%s' não é suportado" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2304,7 -2391,7 +2417,7 @@@ msgstr " "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2312,36 -2399,49 +2425,49 @@@ msgstr " "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Falta directório de listas %spartial." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Falta o diretório de repositório %spartial." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "O driver do método %s não pôde ser encontrado." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Troca de mídia: Por favor insira o disco chamado\n" + " '%s'\n" + "na drive '%s' e pressione enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável" @@@ -2378,87 -2478,87 +2504,87 @@@ msgstr "Não foi possível entender o t msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para marcação" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "A Cache possui um sistema de versões incompatível" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu ao processar %s (NovoPacote)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu ao processar %s (UsePacote1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu ao processar %s (UsePacote2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu ao processar %s (UsePacote3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, você excedeu o número de versões que este APT é capaz de suportar." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu ao processar %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Obtendo File Provides" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" @@@ -2467,11 -2567,11 +2593,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2481,7 -2581,7 +2607,7 @@@ msgstr " "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2490,7 -2590,7 +2616,7 @@@ msgstr " "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2498,7 -2598,7 +2624,7 @@@ msgstr " "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Tamanho incorreto" @@@ -2507,7 -2607,7 +2633,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "O bloco de fabricante %s não contém a impressão digital" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2516,47 -2616,47 +2642,47 @@@ msgstr " "Utilizando o ponto de montagem do CD-ROM %s\n" "A montar o CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "A identificar.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Label Guardada: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "A utilizar o mount point do CD-ROM %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "A desmontar o CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "A aguardar pelo disco...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "A pesquisar os ficheiros de index do Disco..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Encontrou %i indexes de pacotes, %indexes de source e %i assinaturas\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Isso não é um nome válido, tente de novo.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2565,19 -2665,19 +2691,19 @@@ msgstr " "Este Disco tem o nome: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "A copiar listas de pacotes..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "A escrever lista de novas source\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "A desmontar o CD-ROM..." @@@ -2603,6 -2703,60 +2729,60 @@@ msgstr " "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Abrindo ficheiro de configuração %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Ligando a %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instalado: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Recomenda" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Conexão encerrada prematuramente" + #~ msgid "The pkg cache must be initialize first" #~ msgstr "A cache de pacotes deve ser inicializada primeiro" @@@ -2684,20 -2838,6 +2864,6 @@@ #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Falha ao baixar %s %s\n" - #, fuzzy - #~ msgid "Please insert a Disc in the drive and press enter" - #~ msgstr "" - #~ "Troca de mídia: Por favor insira o disco nomeado '%s' no drive '%s' e " - #~ "pressione enter\n" - - #, fuzzy - #~ msgid "Couldn't determine free space in %s" - #~ msgstr "Desculpe, você não tem espaço suficiente em %s" - - #, fuzzy - #~ msgid "Internal error, problem resolver broke stuff" - #~ msgstr "Erro Interno, AllUpgrade quebrou as coisas" - #, fuzzy #~ msgid "Couldn't wait for subprocess" #~ msgstr "Não foi possível checar a lista de pacotes fonte %s" diff --combined po/pt_BR.po index 968259925,6f28b8a77..9a4c91244 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" @@@ -148,8 -148,8 +148,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 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" @@@ -229,6 -229,21 +229,21 @@@ msgstr " "Veja as páginas de manual apt-cache(8) e apt.conf(5) para maiores " "informações.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Troca de mídia: Por favor insira o disco nomeado '%s' no drive '%s' e " + "pressione enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumentos não estão em pares" @@@ -291,7 -306,7 +306,7 @@@ msgstr " " -c=? Ler esse arquivo de configuração\n" " -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" @@@ -300,31 -315,31 +315,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não foi possível conseguir a versão do debconf. Ele está instalado?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Lista de extensão de pacotes é muito extensa" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Erro processando o diretório %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Lista de extensão de fontes é muito extensa" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Erro processando Conteúdo %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -405,11 -420,11 +420,11 @@@ msgstr " " -c=? Lê este arquivo de configuração\n" " -o=? Define uma opção de configuração arbitrária" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Nenhuma seleção correspondente" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Alguns arquivos estão faltando no arquivo de grupo de pacotes `%s'" @@@ -442,83 -457,83 +457,83 @@@ msgstr "Repositório não possui registr msgid "Unable to get a cursor" msgstr "Impossível obter um cursor" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossível ler o diretório %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Impossível checar %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Erros aplicam ao arquivo " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Falha ao resolver %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Falha ao percorrer a árvore" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Falha ao abrir %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Falha ao executar readlink %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Falha ao executar unlink %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Falha ao ligar %s a %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Falha ao checar %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Repositório não possuía campo pacote" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " mantenedor de %s é %s, não %s\n" @@@ -618,79 -633,79 +633,79 @@@ msgstr "Problema executando unlinking % msgid "Failed to rename %s to %s" msgstr "Falha ao renomear %s para %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "S" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências desencontradas:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "mas não está instalável" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "mas não está instalado" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ou" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir serão instalados:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir serão REMOVIDOS:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir serão mantidos em suas versões atuais :" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir serão atualizados :" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir serão REBAIXADOS de versão :" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Os pacotes segurados a seguir serão mudados :" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -699,123 -714,145 +714,145 @@@ msgstr " "AVISO: Os pacotes essenciais a seguir serão removidos\n" "Isso NÃO deve ser feito a menos que você saiba exatamente o que está fazendo!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu desatualizados, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu não atualizados.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " falhou." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de atualizações" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Pronto" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer rodar `apt-get -f install' para corrigir isso." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Dependências desencontradas. Tente usar -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO : Os pacotes a seguir não podem ser autenticados !" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [s/N] ? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 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:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Erro Interno ao adicionar um desvio" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 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:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: 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." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É preciso fazer o download de %sB/%sB de arquivos.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É preciso fazer o download de %sB de arquivos.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Depois de desempacotamento, %sB adicionais de espaço em disco serão usados.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Desculpe, você não tem espaço suficiente em %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço suficiente em %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Triviais Apenas especificado mas essa não é uma operação trivial." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Sim, faça o que eu digo!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -826,28 -863,28 +863,28 @@@ msgstr " "Para continuar digite a frase '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abortado." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 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:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao baixar %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -855,47 -892,47 +892,47 @@@ msgstr " "Impossível pegar alguns arquivos, talvez rodar apt-get update ou tentar com " "--fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados atualmente" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Impossível corrigir pacotes faltosos." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Abortando Instalação." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, selecionando %s ao invés de %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual provido por:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instalado]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Você deve selecionar um explicitamente para instalar." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -906,51 -943,51 +943,51 @@@ msgstr " "Isso pode significar que o pacote está faltando, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "No entanto, os pacotes a seguir o substituem:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais nova.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrada" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão selecionada %s (%s) para %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no diretório de listas" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -958,25 -995,25 +995,44 @@@ msgstr " "Alguns arquivos de índice falharam no download, eles foram ignorados ou os " "antigos foram usados em seu lugar." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++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:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Erro Interno, AllUpgrade quebrou as coisas" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade quebrou as coisas" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 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:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -984,7 -1021,7 +1040,7 @@@ msgstr " "Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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 -1033,7 +1052,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:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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 -1043,117 +1062,113 @@@ msgstr " "esteja simplesmente não instalável e um relato de erro sobre esse\n" "pacotes deve ser enviado." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --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:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pacotes quebrados" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Pacotes recomendados :" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calculando Atualização... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Pronto" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Erro Interno, AllUpgrade quebrou as coisas" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 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:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, 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:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Obter Fonte %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Falha ao fazer o download de alguns arquivos." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, 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:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Processo filho falhou" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1115,7 -1162,7 +1177,7 @@@ msgstr " "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1124,32 -1171,32 +1186,32 @@@ msgstr " "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependência %s para %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de construção" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Módulos Suportados:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1458,8 -1505,8 +1520,9 @@@ msgstr "Sobreescrita de pacote não cas msgid "File %s/%s overwrites the one in the package %s" msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@@ -1489,9 -1536,9 +1552,9 @@@ msgid "The info and temp directories ne msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Lendo Lista de Pacotes" @@@ -1601,12 -1648,12 +1664,12 @@@ msgstr "Falha em localizar um arquivo d msgid "Unparsable control file" msgstr "Arquivo de controle não interpretável" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Impossível ler a base de dados de cdrom %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1614,28 -1661,34 +1677,34 @@@ msgstr " "Por favor use o apt-cdrom para fazer com que este CD seja reconhecido pelo " "APT. apt-get update não pode ser usado para adicionar novos CDs" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD errado" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Arquivo não encontrado" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Arquivo não encontrado" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Falha ao checar" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificação" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "URI inválida, URIs locais não devem iniciar com //" @@@ -1693,7 -1746,7 +1762,7 @@@ msgstr "Tempo limite de conexão atingid msgid "Server closed the connection" msgstr "Servidor fechou a conexão" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@@ -1705,7 -1758,7 +1774,7 @@@ msgstr "Uma resposta sobrecarregou o bu msgid "Protocol corruption" msgstr "Corrupção de protocolo" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de gravação" @@@ -1806,43 -1859,81 +1875,81 @@@ msgstr "Não foi possível criar um socke msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Não posso iniciar a conexão para %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Não foi possível conectar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Não foi possível resolver '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Falaha temporária resolvendo '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Impossível conectar em %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Não foi possível obter trava %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Os pacotes extra a seguir serão instalados:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1926,10 -2017,6 +2033,6 @@@ msgstr "Conexão falhou. msgid "Internal error" msgstr "Erro interno" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Conexão encerrada prematuramente" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Não foi possível fazer mmap de arquivo vazio" @@@ -1944,58 -2031,58 +2047,58 @@@ msgstr "Impossível fazer mmap de %lu by msgid "Selection %s not found" msgstr "Seleção %s não encontrada" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviação de tipo desconhecida: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo arquivo de configuração %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Linha %d muito longa (máx. %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag Malformada" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Muitos includes aninhados" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Diretiva '%s' não suportada" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo" @@@ -2062,7 -2149,7 +2165,7 @@@ msgstr "Operação %s inválida msgid "Unable to stat the mount point %s" msgstr "Impossível checar o ponto de montagem %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@@ -2071,70 -2158,70 +2174,70 @@@ msgid "Failed to stat the cdrom" msgstr "Impossível checar o cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Não usando locking para arquivo de trava somente leitura %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abri arquivo de trava %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Não usando locking para arquivo de trava montado via nfs %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter trava %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir arquivo %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "gravação, ainda restam %lu para gravar mas não foi possível" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problema fechando o arquivo" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Problema removendo o link do arquivo" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" @@@ -2207,18 -2294,18 +2310,28 @@@ msgstr "opcional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Construindo Árvore de Dependências" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versões Candidatas" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Geração de Dependência" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Mesclando informação Disponível" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Falha ao gravar arquivo %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2229,52 -2316,52 +2342,52 @@@ msgstr "Impossível analizar arquivo de msgid "Unable to parse package file %s (2)" msgstr "Impossível analizar arquivo de pacote %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu no arquivo de fontes %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu no arquivo de fontes %s (distribuição)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu no arquivo de fontes %s (análise de URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu no arquivo de fontes %s (Distribuição absoluta)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu no arquivo de fontes %s (análise de distribuição)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abrindo %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na sources.lits %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u no arquivo de fontes %s (tipo)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" @@@ -2296,7 -2383,7 +2409,7 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Tipo de arquivo de índice '%s' não é suportado" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2304,7 -2391,7 +2417,7 @@@ msgstr " "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2312,36 -2399,49 +2425,49 @@@ msgstr " "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Diretório de listas %spartial está faltando." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Diretório de repositório %spartial está faltando." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "O driver do método %s não pôde ser encontrado." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Troca de mídia: Por favor insira o disco nomeado\n" + " '%s'\n" + "no drive '%s' e pressione enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável." @@@ -2379,86 -2479,86 +2505,86 @@@ msgstr "Naõ foi possível entender o tip msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para pinagem" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "O Cache possui um sistema de versões incompatível" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVersão1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVersão2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Ops, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Ops, você excedeu o número de versões que este APT é capaz de suportar." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Ops, você excedeu o número de dependências que este APT é capaz de suportar." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu processando %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pacote %s %s não foi encontrado processando dependências de arquivo" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível checar a lista de pacotes fonte %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Coletando File Provides" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar cache fonte" @@@ -2467,11 -2567,11 +2593,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2481,7 -2581,7 +2607,7 @@@ msgstr " "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2490,7 -2590,7 +2616,7 @@@ msgstr " "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2498,7 -2598,7 +2624,7 @@@ msgstr " "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Tamanho incorreto" @@@ -2507,7 -2607,7 +2633,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Bloco Fornecedor %s não contém é inválido" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2516,49 -2616,49 +2642,49 @@@ msgstr " "Uando ponto de montagem de CD-ROM %s\n" "Montando CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identificando .." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Rótulo Armazenado : %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando ponto de montagem de CD-ROm %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Desmontando CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Aguardando por disco ...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Montando CD-ROM ...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Procurando por arquivos de índice no disco ..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" "Encontrado(s) %i índice(s) de pacote(s), %i índice(s) de fonte(s) e %i " "assinaturas\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Este não é um nome válido, tente novamente.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2567,19 -2667,19 +2693,19 @@@ msgstr " "Esse disco é chamado :\n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Copiando lista de pacotes ..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Gravanco nova lista de fontes\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Entradas na Lista de Fontes para este Disco são : \n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Desmontando CD-ROM ..." @@@ -2605,6 -2705,60 +2731,60 @@@ msgstr " "Gravados %i registros com %i arquivos faltando e %i arquivos que não " "combinam\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Abrindo arquivo de configuração %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Conectando a %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Instalado: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Abrindo %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Recomenda" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Conexão encerrada prematuramente" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s" @@@ -2656,20 -2810,6 +2836,6 @@@ #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Falha ao baixar %s %s\n" - #, fuzzy - #~ msgid "Please insert a Disc in the drive and press enter" - #~ msgstr "" - #~ "Troca de mídia: Por favor insira o disco nomeado '%s' no drive '%s' e " - #~ "pressione enter\n" - - #, fuzzy - #~ msgid "Couldn't determine free space in %s" - #~ msgstr "Desculpe, você não tem espaço suficiente em %s" - - #, fuzzy - #~ msgid "Internal error, problem resolver broke stuff" - #~ msgstr "Erro Interno, AllUpgrade quebrou as coisas" - #, fuzzy #~ msgid "Couldn't wait for subprocess" #~ msgstr "Não foi possível checar a lista de pacotes fonte %s" diff --combined po/ro.po index 30546b718,9d1e7b34c..a2dfe7ce0 --- a/po/ro.po +++ b/po/ro.po @@@ -1,19 -1,19 +1,19 @@@ # translation of apt_ro.po to Romanian # This file is put in the public domain. -# Sorin Batariuc , 2004, 2005. +# Sorin Batariuc , 2004. # msgid "" msgstr "" -"Project-Id-Version: apt_po_ro\n" +"Project-Id-Version: apt_ro\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-08-25 17:43+0300\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2004-11-16 01:22+0200\n" "Last-Translator: Sorin Batariuc \n" -"Language-Team: Romanian \n" +"Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: cmdline/apt-cache.cc:135 @@@ -38,15 -38,15 +38,15 @@@ msgstr " Pachete normale: #: cmdline/apt-cache.cc:273 msgid " Pure virtual packages: " -msgstr " Pachete virtuale pure: " +msgstr " Pachete pur virtuale: " #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr " Pachete virtuale singulare: " +msgstr " Pachete singur virtuale: " #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " -msgstr " Pachete virtuale mixte: " +msgstr " Pachete mixt virtuale: " #: cmdline/apt-cache.cc:276 msgid " Missing: " @@@ -66,19 -66,19 +66,19 @@@ msgstr "Total relaÅ£ii versiune/fişier #: cmdline/apt-cache.cc:285 msgid "Total Provides mappings: " -msgstr "Total cartări Furnizează: " +msgstr "Total furnizări mappings: " #: cmdline/apt-cache.cc:297 msgid "Total globbed strings: " -msgstr "Total şiruri înglobate: " +msgstr "Total şiruri globbed: " #: cmdline/apt-cache.cc:311 msgid "Total dependency version space: " -msgstr "Total spaÅ£iu versiuni ale dependenÅ£elor: " +msgstr "Total spaÅ£iu versiuni dependenÅ£e: " #: cmdline/apt-cache.cc:316 msgid "Total slack space: " -msgstr "Total spaÅ£iu intern: " +msgstr "Total spaÅ£iu liber: " #: cmdline/apt-cache.cc:324 msgid "Total space accounted for: " @@@ -91,7 -91,7 +91,7 @@@ msgstr "Fişierul pachetului %s este de #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" -msgstr "Trebuie să daÅ£i exact un şablon" +msgstr "Trebuie să daÅ£i exact un model" #: cmdline/apt-cache.cc:1385 msgid "No packages found" @@@ -99,11 -99,11 +99,11 @@@ msgstr "Nu s-au găsit pachete #: cmdline/apt-cache.cc:1462 msgid "Package files:" -msgstr "Fişiere pachet: " +msgstr "Fişierele pachetelor: " #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Cache este desincronizat, nu pot executa x-ref un fişier pachet" +msgstr "Cache este desincronizat, nu pot x-ref un fişier pachet" #: cmdline/apt-cache.cc:1470 #, c-format @@@ -113,7 -113,7 +113,7 @@@ msgstr "%4i %s\n #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1482 msgid "Pinned packages:" -msgstr "Pachete alese special:" +msgstr "Pachete fixate:" #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" @@@ -122,7 -122,7 +122,7 @@@ msgstr "(negăsit) #. Installed version #: cmdline/apt-cache.cc:1515 msgid " Installed: " -msgstr " Instalat: " +msgstr " Instalate: " #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" @@@ -131,16 -131,16 +131,16 @@@ msgstr "(niciunul) #. Candidate Version #: cmdline/apt-cache.cc:1522 msgid " Candidate: " -msgstr " Candidează: " +msgstr " Candidat: " #: cmdline/apt-cache.cc:1532 msgid " Package pin: " -msgstr " Pachet ales special: " +msgstr " Pachet fixat: " #. Show the priority tables #: cmdline/apt-cache.cc:1541 msgid " Version table:" -msgstr " Tabela de versiuni:" +msgstr " Versiunea tabelei:" #: cmdline/apt-cache.cc:1556 #, c-format @@@ -148,8 -148,8 +148,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pentru %s %s compilat pe %s %s\n" @@@ -197,20 -197,20 +197,20 @@@ msgstr " " apt-cache [opÅ£iuni] showpkg pachet1 [pachet2 ...]\n" " apt-cache [opÅ£iuni] showsrc pachet1 [pachet2 ...]\n" "\n" -"apt-cache este o unealtă de nivel scăzut pentru manipularea fişierelor\n" -"binare din cache-ul APT, şi de interogare a informaÅ£iilor din ele\n" +"apt-cache este o unealtă de nivel scăzut pentru manipularea cache-lui\n" +"fişierelor binare APT, şi de interogare informaÅ£ii din ele\n" "\n" "Comenzi:\n" -" add - Adaugă un fişier pachet la cache-ul sursă\n" -" gencaches - Construieşte şi cache-ul pachet şi cache-ul sursă\n" +" add - Adaugă un fişier pachet la sursa cache\n" +" gencaches - Construieşte şi pachetul şi sursa cache\n" " showpkg - Arată unele informaÅ£ii generale pentru un singur pachet\n" " showsrc - Arată înregistrările sursei\n" " stats - Arată unele statistici de bază\n" " dump - Arată întregul fişier într-o formă concisă\n" " dumpavail - Afişează un fişier disponibil către stdout\n" " unmet - Arată dependenÅ£ele neîndeplinite\n" -" search - Caută în lista de pachete pentru un şablon regex\n" -" show - Arată o înregistrare lizibilă pentru pachet\n" +" search - Caută în lista de pachete pentru un model regex\n" +" show - Arată o înregistrare lizibilă pentru un pachet\n" " depends - Arată informaÅ£ii brute de dependenţă pentru un pachet\n" " rdepends - Arată dependenÅ£ele inversate pentru un pachet\n" " pkgnames - Afişează numele tuturor pachetelor\n" @@@ -220,14 -220,30 +220,30 @@@ "\n" "OpÅ£iuni:\n" " -h Acest text de ajutor.\n" -" -p=? Cache-ul de pachete.\n" -" -s=? Cache-ul de surse.\n" +" -p=? Pachetul cache.\n" +" -s=? Sursa cache.\n" " -q Dezactivează indicatorul de progres.\n" " -i Arată doar dependenÅ£ele importante pentru comanda neîndeplinită.\n" " -c=? Citeşte acest fişier de configurare\n" " -o=? Ajustează o opÅ£iune de configurare arbitrară, ex. -o dir::cache=/tmp\n" "VedeÅ£i manualele apt-cache(8) şi apt.conf(5) pentru mai multe informaÅ£ii.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Schimbare de mediu: Vă rog introduceÅ£i discul numit\n" + " '%s'\n" + "în unitatea '%s' şi apăsaÅ£i Enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumentele nu sunt perechi" @@@ -253,7 -269,7 +269,7 @@@ msgstr " "APT\n" "\n" "Comenzi:\n" -" shell - Modul consolă\n" +" shell - Modul shell\n" " dump - Arată configurarea\n" "\n" "OpÅ£iuni:\n" @@@ -264,7 -280,7 +280,7 @@@ #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s nu este un pachet DEB valid." +msgstr "%s nu este un pachet DEB valabil." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@@ -290,7 -306,7 +306,7 @@@ msgstr " " -c=? Citeşte acest fişier de configurare\n" " -o=? Ajustează o opÅ£iune de configurare arbitrară, ex. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Nu pot scrie în %s" @@@ -299,32 -315,31 +315,32 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nu pot citi versiunea debconf. Este instalat debconf?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" -msgstr "Lista de extensii pentru pachet este prea lungă" +msgstr "Lista extensiei pachetului este prea lungă" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Eroare la prelucrarea directorului %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" -msgstr "Lista de extensii pentru sursă este prea lungă" +msgstr "Lista extensiei sursei este prea lungă" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "Eroare la scrierea antetului în fişierul index" +msgstr "Eroare la scrierea antetului în conÅ£inutul fişierului" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Eroare la prelucrarea conÅ£inutului %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -366,11 -381,11 +382,11 @@@ " -o=? Set an arbitrary configuration option" msgstr "" "Utilizare: apt-ftparchive [opÅ£iuni] comanda\n" -"Comenzi: packages cale_binare [fişier_înlocuire [prefix_cale]]\n" -" sources cale_src [fişier_înlocuire [prefix_cale]]\n" -" contents cale\n" -" release cale\n" -" generate config [grupuri]\n" +"Comenzi: packages binarypath [fişier_înlocuire [prefix_cale]]\n" +" sources srcpath [fişier_înlocuire [prefix_cale]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" " clean config\n" "\n" "apt-ftparchive generează fişiere de indexare pentru arhivele Debian. " @@@ -378,23 -393,23 +394,23 @@@ "multe stiluri de generare de la complet automat la înlocuiri funcÅ£ionale\n" "pentru dpkg-scanpackage şi dpkg-scansources\n" "\n" -"apt-ftparchive generează fişierele Package dintr-un arbore de .deb-uri.\n" -"Fişierul Pachet înglobează conÅ£inutul tuturor câmpurilor de control din " +"apt-ftparchive generează fişierele pachetelor dintr-un arbore de .deb-uri.\n" +"Fişierul pachet înglobează conÅ£inutul tuturor câmpurilor de control din " "fiecare\n" -"pachet cât şi MD5 hash şi dimensiunea fişierului. Un fişier de înlocuire " +"pachet ca şi MD5 hash şi dimensiunea fişierului. Un fişier de înlocuire " "este\n" -"furnizat pentru a forÅ£a valoarea Priorităţii şi SecÅ£iunii.\n" +"furnizat pentru a forÅ£a valoarea priorităţii şi secÅ£iunii.\n" "\n" -"În mod asemănator apt-ftparchive generează fişierele Sources dintr-un arbore " +"În mod asemănator apt-ftparchive generează fişierele surse dintr-un arbore " "de .dsc-uri.\n" "OpÅ£iunea --source-override poate fi folosită pentru a specifica fişierul de " "înlocuire\n" "\n" "Comenzile 'packages' şi 'sources' ar trebui executate în rădăcina " "arborelui.\n" -"Cale_binare ar trebui să indice baza căutării recursive şi fişierul de " +"Binaryparh ar trebui să indice baza căutării recursive şi fişierul de " "înlocuire ar\n" -"trebui să conÅ£ină semnalizatorul de înlocuire. Prefix_cale este adăugat " +"trebui să conÅ£ină semnalizatorul de înlocuire. Prefixul căii este adăugat " "câmpului\n" "de nume fişier dacă acesta este prezent. Exemplu de utilizare din arhiva\n" "Debian:\n" @@@ -404,19 -419,19 +420,19 @@@ "OpÅ£iuni:\n" " -h Acest text de ajutor.\n" " --md5 Generarea controlului MD5\n" -" -s=? Fişierul de înlocuire pentru surse\n" +" -s=? Sursa fişierului de înlocuire\n" " -q În linişte\n" -" -d=? Selectează baza de date de cache opÅ£ională\n" +" -d=? Selectează caching-ul opÅ£ional al bazei de date\n" " --no-delink Activează modul de depanare dezlegare\n" -" --contents Generarea fişierului cu sumarul de control\n" +" --contents Generarea controlului conÅ£inutului fişierului\n" " -c=? Citeşte acest fişier de configurare\n" " -o=? Ajustează o opÅ£iune de configurare arbitrară" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Nu s-a potrivit nici o selecÅ£ie" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Unele fişiere lipsesc din grupul fişierului pachet '%s'" @@@ -424,12 -439,12 +440,12 @@@ #: ftparchive/cachedb.cc:45 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB a fost corupt, fişierul a fost redenumit %s.old" +msgstr "DB a fost deteriorat, fişierul a fost redenumit %s.old" #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB este vechi, se încearcă înnoirea %s" +msgstr "DB este vechi, se aşteaptă înnoirea %s" #: ftparchive/cachedb.cc:73 #, c-format @@@ -449,83 -464,83 +465,83 @@@ msgstr "Arhiva nu are înregistrare de msgid "Unable to get a cursor" msgstr "Nu pot obÅ£ine un cursor" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Nu pot citi directorul %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Nu pot determina starea %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "A: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Erori la fişierul " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Eşuare în a rezolva %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Eşuare în parcurgerea arborelui" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Eşuare la deschiderea %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " Dezlegare %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Eşuare la citirea legăturii %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Eşuare în desfacerea legăturii %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Eşuare în legarea %s de %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " Limita de %sB a dezlegării a fost atinsă.\n" +msgstr " Atinsă limita de %sB a dezlegării.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Eşuare în determinarea stării %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" @@@ -609,7 -624,7 +625,7 @@@ msgstr "decompresor #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "IE către subproces/fişier eşuat" +msgstr "IO către subproces/fişier eşuat" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" @@@ -625,79 -640,79 +641,79 @@@ msgstr "Problemă la desfacerea %s msgid "Failed to rename %s to %s" msgstr "Eşuare în a redenumi %s în %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" -msgstr "Eroare de compilare expresie regulată - %s" +msgstr "Eroare de compilare regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependenÅ£e neîndeplinite:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "dar nu este instalabil" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "dar nu este instalat" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " sau" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ŞTERSE:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reÅ£inute:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Următoarele pachete Å£inute vor fi schimbate:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -706,124 -721,145 +722,146 @@@ msgstr " "AVERTISMENT: Următoarele pachete esenÅ£iale vor fi şterse\n" "Aceasta NU ar trebui făcută decât dacă ştiÅ£i exact ce vreÅ£i!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de şters şi %lu neînnoite.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau şterse incomplet.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Corectez dependenÅ£ele..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " eşuare." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Nu pot corecta dependenÅ£ele" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" -msgstr "Nu pot micşora mulÅ£imea pachetelor de înnoire" +msgstr "Nu pot micşora setul de înnoire" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" -msgstr " Terminat" +msgstr " Gata" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "AÅ£i putea să porniÅ£i 'apt-get -f install' pentru a corecta acestea." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." -msgstr "DependenÅ£e neîndeplinite. ÎncercaÅ£i să folosiÅ£i -f." +msgstr "DependenÅ£e neîndeplinite. ÎncercaÅ£i folosirea -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 +#, fuzzy msgid "WARNING: The following packages cannot be authenticated!" -msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" +msgstr "Următoarele pachete vor fi ÎNNOITE:" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " -msgstr "InstalaÅ£i aceste pachete fără verificare [y/N]? " +msgstr "" --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" -msgstr "Unele pachete n-au putut fi autentificate" +msgstr "" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Eroare internă în timpul adăugării unei diversiuni" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Nu pot încuia directorul de descărcare" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB/%sB de arhive.\n" +msgstr "Este nevoie de %sB/%sB de arhive.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB de arhive.\n" +msgstr "Este nevoie de %sB de arhive.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "După despachetare va fi folosit %sB de spaÅ£iu suplimentar pe disc.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "După despachetare va fi eliberat %sB din spaÅ£iul de pe disc.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Nu aveÅ£i suficient spaÅ£iu în %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Nu aveÅ£i suficient spaÅ£iu în %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "A fost specificat 'doar neimportant' dar nu este o operaÅ£iune neimportantă." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Da, fă cum îţi spun!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -834,29 -870,28 +872,29 @@@ msgstr " "Pentru a continua tastaÅ£i fraza '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "RenunÅ£are." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 +#, fuzzy msgid "Do you want to continue [Y/n]? " -msgstr "VreÅ£i să continuaÅ£i [Y/n]? " +msgstr "VreÅ£i să continuaÅ£i? [Y/n] " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eşuare în aducerea %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Eşuare în descărcarea unor fişiere" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Descărcare completă şi în modul doar descărcare" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -864,47 -899,47 +902,47 @@@ msgstr " "Nu pot aduce unele arhive, poate porniÅ£i 'apt-get update' sau încercaÅ£i cu --" "fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Abandonez instalarea." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Notă, se selectează %s în locul lui %s\n" +msgstr "Notă, selectarea %s în locul lui %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pachetul %s este un pachet virtual furnizat de către:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Instalat]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Ar trebui să alegeÅ£i în mod explicit unul pentru instalare." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -915,49 -950,49 +953,49 @@@ msgstr " "Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n" "este disponibil numai din altă sursă\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Oricum următoarele pachete îl înlocuiesc:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" -msgstr "Pachetul %s nu are nici un candidat la instalare" +msgstr "Pachetul %s nu are nici un candidat de instalare" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s este deja la cea mai nouă versiune.\n" +msgstr "%s are deja cea mai nouă versiune.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Release '%s' pentru '%s' n-a fost găsită" +msgstr "ProducÅ£ia '%s' pentru '%s' n-a fost găsită" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -965,25 -1000,25 +1003,44 @@@ msgstr " "Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au " "fost folosite în loc unele vechi." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Următoarele informaÅ£ii ar putea să vă ajute la rezolvarea situaÅ£iei:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" +msgstr "Notă, selectare %s pentru regex '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "AÅ£i putea porni 'apt-get -f install' pentru a corecta acestea:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -991,7 -1026,7 +1048,7 @@@ msgstr " "DependenÅ£e neîndeplinite. ÎncercaÅ£i 'apt-get -f install' fără nici un pachet " "(sau oferiÅ£i o altă soluÅ£ie)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1004,7 -1039,7 +1061,7 @@@ msgstr " "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1014,107 -1049,117 +1071,113 @@@ msgstr " " că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n" "acest pachet ar trebui completat." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Următoarele informaÅ£ii ar putea să vă ajute la rezolvarea situaÅ£iei:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pachete deteriorate" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Pachete sugerate:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Pachete recomandate:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Eşuare" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" -msgstr "Terminat" +msgstr "Gata" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puÅ£in un pachet pentru a-i aduce sursa" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu pot găsi o sursă pachet pentru %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveÅ£i suficient spaÅ£iu în %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB/%sB din arhivele surselor.\n" +msgstr "Este nevoie de %sB/%sB din arhivele surselor.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB din arhivele surselor.\n" +msgstr "Este nevoie de %sB din arhivele surselor.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Eşuare în a aduce unele arhive." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eşuată.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eşuată.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Eşuare proces copil" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puÅ£in un pachet pentru a-i verifica dependenÅ£ele " "înglobate" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informaÅ£iile despre dependenÅ£ele înglobate ale lui %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenÅ£e înglobate.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1123,41 -1168,41 +1186,41 @@@ msgstr " "DependenÅ£a lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" "DependenÅ£a lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " -"disponibilă a pachetului %s nu poate satisface versiunile cerute" +"disponibilă a pachetului %s nu poate satisface cererile de versiuni" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eşuare în a satisface dependenÅ£a lui %s de %s: Pachetul instalat %s este " "prea nou" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eşuare în a satisface dependenÅ£a lui %s de %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "DependenÅ£ele înglobate pentru %s nu pot fi satisfăcute." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Eşuare în a prelucra dependenÅ£ele înglobate" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Module suportate:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1353,7 -1398,7 +1416,7 @@@ msgstr "Arhivă deteriorată #: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" -msgstr "Eşuarea sumei de control în arhiva tar, arhivă deteriorată" +msgstr "Eşuare checksum tar, arhivă deteriorată" #: apt-inst/contrib/extracttar.cc:298 #, c-format @@@ -1452,7 -1497,7 +1515,7 @@@ msgstr "Directorul %s este înlocuit d #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "Eşuare în localizarea nodului din tranşa hash" +msgstr "Eşuare în localizarea nodului din găleata hash" #: apt-inst/extract.cc:287 msgid "The path is too long" @@@ -1468,8 -1513,8 +1531,9 @@@ msgstr "Pachetul suprascris nu se potri msgid "File %s/%s overwrites the one in the package %s" msgstr "Fişierul %s/%s suprascrie pe cel din pachetul %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nu pot citi %s" @@@ -1501,9 -1546,9 +1565,9 @@@ msgstr " "fişiere" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Citire liste de pachete" @@@ -1561,6 -1606,7 +1625,6 @@@ msgid "Internal error adding a diversio msgstr "Eroare internă în timpul adăugării unei diversiuni" #: apt-inst/deb/dpkgdb.cc:383 -#, fuzzy msgid "The pkg cache must be initialized first" msgstr "Cache-ul pachetului trebuie întâi iniÅ£ializat" @@@ -1589,9 -1635,9 +1653,9 @@@ msgid "This is not a valid DEB archive msgstr "Aceasta nu este o arhivă DEB validă, lipseşte membrul '%s'" #: apt-inst/deb/debfile.cc:52 -#, c-format +#, fuzzy, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Aceasta nu este o arhivă DEB validă, nu are membrul '%s' sau '%s'" +msgstr "Aceasta nu este o arhivă DEB validă, lipseşte membrul '%s'" #: apt-inst/deb/debfile.cc:112 #, c-format @@@ -1610,12 -1656,12 +1674,12 @@@ msgstr "Eşuare de localizare a unui fi msgid "Unparsable control file" msgstr "Fişier de control neanalizabil" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Nu pot citi baza de date a cdrom-ului %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1623,29 -1669,34 +1687,35 @@@ msgstr " "Vă rog folosiÅ£i apt-cdrom pentru a face recunoscut acest CD de către APT. " "'apt-get update' nu poate fi folosit pentru adăugarea de noi CD-uri" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 +#, fuzzy msgid "Wrong CD-ROM" -msgstr "CD-ROM necorespunzător" +msgstr "CD necorespunzător" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Fişier negăsit" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fişier negăsit" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Eşuare de determinare a stării" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Eşuare la ajustarea timpului" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "URI invalid, URIS local trebuie sa nu înceapă cu //" @@@ -1703,7 -1754,7 +1773,7 @@@ msgstr "Timpul de conectare a expirat msgid "Server closed the connection" msgstr "Serverul a terminat conexiunea" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Eroare de citire" @@@ -1715,7 -1766,7 +1785,7 @@@ msgstr "Un răspuns a inundat zona tamp msgid "Protocol corruption" msgstr "Degradare protocol" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Eroare de scriere" @@@ -1771,7 -1822,7 +1841,7 @@@ msgstr "Nu pot accepta conexiune #: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Problemă la indexarea fişierului" +msgstr "Problemă la criptarea fişierului" #: methods/ftp.cc:877 #, c-format @@@ -1816,43 -1867,81 +1886,81 @@@ msgstr "Nu pot crea un socket pentru % msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nu pot iniÅ£ia conectarea la %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "N-am putut conecta la %s:%s (%s), timp de conectare expirat" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "N-am putut conecta la %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectare la %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Nu pot rezolva '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Eşuare temporară în rezolvarea '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "S-a întâmplat ceva rău la rezolvarea '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nu pot conecta la %s %s" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Nu pot determina blocajul %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Următoarele extra pachete vor fi instalate:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1937,10 -2026,6 +2045,6 @@@ msgstr "Conectare eşuată msgid "Internal error" msgstr "Eroare internă" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Conexiune închisă prematur" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Nu pot mmap un fişier gol" @@@ -1955,58 -2040,58 +2059,58 @@@ msgstr "Nu pot face mmap la %lu bytes msgid "Selection %s not found" msgstr "SelecÅ£ia %s nu s-a găsit" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tip de prescurtare nerecunoscut: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Deschidere fişier de configurare %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Linie %d prea lungă (max %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume" - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Eroare de sintaxă %s:%u: etichetă greşită" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Eroare de sintaxă %s:%u: incluse de aici" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârşitul fişierului" @@@ -2019,7 -2104,7 +2123,7 @@@ msgstr "%c%s... Eroare! #: apt-pkg/contrib/progress.cc:156 #, c-format msgid "%c%s... Done" -msgstr "%c%s... Terminat" +msgstr "%c%s... Gata" #: apt-pkg/contrib/cmndline.cc:80 #, c-format @@@ -2061,7 -2146,7 +2165,7 @@@ msgstr "OpÅ£iunea '%s' este prea lungă #: apt-pkg/contrib/cmndline.cc:301 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Sensul %s nu este înÅ£eles, încercaÅ£i adevărat (true) sau fals (false)." +msgstr "Sensul %s nu este înÅ£eles, încercaÅ£i adevărat sau fals." #: apt-pkg/contrib/cmndline.cc:351 #, c-format @@@ -2073,7 -2158,7 +2177,7 @@@ msgstr "OperaÅ£iune invalidă %s msgid "Unable to stat the mount point %s" msgstr "Nu pot determina starea punctului de montare %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nu pot schimba la %s" @@@ -2082,70 -2167,70 +2186,70 @@@ msgid "Failed to stat the cdrom" msgstr "Eşuare la determinarea stării cdrom-ului" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nu s-a folosit închiderea pentru fişierul disponibil doar-citire %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Nu pot deschide fişierul blocat %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nu este folosit blocajul pentru fişierul montat nfs %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Nu pot determina blocajul %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Aşteptat %s, dar n-a fost acolo" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subprocesul %s a primit o eroare de segmentare." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subprocesul %s a întors un cod de eroare (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Nu pot deschide fişierul %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problemă la închiderea fişierului" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Problemă la dezlegarea fişierului" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fişierului" @@@ -2218,18 -2303,18 +2322,28 @@@ msgstr "opÅ£ional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Se construieşte arborele de dependenţă" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Versiuni candidat" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generare dependenÅ£e" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Unirea informaÅ£iilor disponibile" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Eşuare în a scrie fişierul %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2240,52 -2325,52 +2354,52 @@@ msgstr "Nu pot analiza fişierul pache msgid "Unable to parse package file %s (2)" msgstr "Nu pot analiza fişierul pachet %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greşită %lu în lista sursă %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greşită %lu în lista sursă %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greşită %lu în lista sursă %s (analiza URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greşită %lu în lista sursă %s (dist. absolută)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greşită %lu în lista sursă %s (analiza dist.)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Deschidere %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greşită %u în lista sursă %s (tip)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linie greşită %u în lista sursă %s (identificator vânzător)" @@@ -2298,7 -2383,7 +2412,7 @@@ msgid " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" "Aceasta instalare va avea nevoie de ştergerea temporară a pachetului " -"esenÅ£ial %s din cauza unui bucle conflict/pre-dependenţă. Asta de multe ori " +"esenÅ£ial %s din cauza unui cerc conflict/pre-dependenţă. Asta de multe ori " "nu-i de bine, dar dacă vreÅ£i întradevăr s-o faceÅ£i, activaÅ£i opÅ£iunea APT::" "Force-LoopBreak." @@@ -2307,14 -2392,14 +2421,14 @@@ msgid "Index file type '%s' is not supported" msgstr "Tipul de fişier index '%s' nu este suportat" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2322,36 -2407,49 +2436,49 @@@ msgstr " "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " "cauzată de pachete Å£inute." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, aÅ£i Å£inut pachete deteriorate." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Directorul de liste %spartial lipseşte." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Directorul de arhive %spartial lipseşte." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Metoda driver %s nu poate fi găsită." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nu s-a lansat corect" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Schimbare de mediu: Vă rog introduceÅ£i discul numit\n" + " '%s'\n" + "în unitatea '%s' şi apăsaÅ£i Enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistemul de pachete '%s' nu este suportat" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nu pot determina un tip de sistem de pachete potrivit" @@@ -2388,87 -2486,87 +2515,87 @@@ msgstr "Nu s-a înÅ£eles tipul de pin % msgid "No priority (or zero) specified for pin" msgstr "Fără prioritate (sau zero) specificată pentru pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Cache are un versioning system incompatibil" --#: apt-pkg/pkgcachegen.cc:117 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:119 +#, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Eroare în timpul procesării %s (Pachet Nou)" +msgstr "Eroare în timpul procesării %s (pachet nou)" --#: apt-pkg/pkgcachegen.cc:129 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:131 +#, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Eroare în timpul procesării %s (UsePackage1)" +msgstr "Eroare în timpul procesării %s (folosit pachet 1)" --#: apt-pkg/pkgcachegen.cc:150 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:152 +#, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Eroare în timpul procesării %s (UsePackage2)" +msgstr "Eroare în timpul procesării %s (folosit pachet 2)" --#: apt-pkg/pkgcachegen.cc:154 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:156 +#, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Eroare în timpul procesării %s (NewFileVer1)" +msgstr "Eroare în timpul procesării %s (fişier nou versiunea 1)" --#: apt-pkg/pkgcachegen.cc:184 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:186 +#, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Eroare în timpul procesării %s (NewVersion1)" +msgstr "Eroare în timpul procesării %s (versiune nouă 1)" --#: apt-pkg/pkgcachegen.cc:188 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:190 +#, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Eroare în timpul procesării %s (UsePackage3)" +msgstr "Eroare în timpul procesării %s (folosire pachet 3)" --#: apt-pkg/pkgcachegen.cc:192 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:194 +#, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Eroare în timpul procesării %s (NewVersion2)" +msgstr "Eroare în timpul procesării %s (versiune nouă 2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Mamăăă, aÅ£i depăşit numărul de nume de pachete de care este capabil acest " "APT." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Mamăăă, aÅ£i depăşit numărul de versiuni de care este capabil acest APT." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Mamăăă, aÅ£i depăşit numărul de dependenÅ£e de care este capabil acest APT." --#: apt-pkg/pkgcachegen.cc:241 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:243 +#, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Eroare în timpul procesării %s (FindPkg)" +msgstr "Eroare în timpul procesării %s (găsire pachet)" --#: apt-pkg/pkgcachegen.cc:254 -#, fuzzy, c-format ++#: apt-pkg/pkgcachegen.cc:256 +#, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Eroare în timpul procesării %s (CollectFileProvides)" +msgstr "Eroare în timpul procesării %s (colectare furnizor fişiere)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Nu s-a găsit pachetul %s %s în timpul procesării dependenÅ£elor de fişiere" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" -msgstr "Colectare furnizori fişier" +msgstr "Colectare furnizori fişiere" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" @@@ -2477,20 -2575,20 +2604,20 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eşuată, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " -"că aveÅ£i nevoie să reparaÅ£i manual acest pachet (din pricina unui arch lipsă)" +"că aveÅ£i nevoie să depanaÅ£i manual acest pachet (din pricina unui arch lipsă)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2499,7 -2597,7 +2626,7 @@@ msgstr " "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveÅ£i nevoie să depanaÅ£i manual acest pachet." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2507,108 -2605,160 +2634,162 @@@ msgstr " "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" #: apt-pkg/vendorlist.cc:66 -#, c-format +#, fuzzy, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "Blocul vânzător %s nu conÅ£ine amprentă" +msgstr "Blocul vânzător %s este invalid" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Utilizare puct de montare CD-ROM %s\n" -"Montare CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " -msgstr "Identificare.. " +msgstr "" - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" -msgstr "Etichetă memorată: %s \n" +msgstr "" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Utilizare punct de montare CD-ROM %s\n" +msgstr "" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" -msgstr "Demontare CD-ROM\n" +msgstr "" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 +#, fuzzy msgid "Waiting for disc...\n" -msgstr "Aştept discul...\n" +msgstr "În aşteptarea antetelor" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" -msgstr "Montez CD-ROM...\n" +msgstr "" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" -msgstr "Scanez discul de fişierele index..\n" +msgstr "" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Găsite %i indexuri de pachete, %i indexuri de surse şi %i semnături\n" +msgstr "" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" -msgstr "Acesta nu este un nume valid, mai încercaÅ£i.\n" +msgstr "" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Acest disc este numit: \n" -"'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 +#, fuzzy msgid "Copying package lists..." -msgstr "Copiez listele de pachete.." +msgstr "Citire liste de pachete" - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 +#, fuzzy msgid "Writing new source list\n" -msgstr "Scriere noua listă sursă\n" +msgstr "Linia %u prea lungă în lista sursă %s." - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" -msgstr "Intrările listei surselor pentru acest disc sunt:\n" +msgstr "" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." -msgstr "Demontez CD-ROM..." +msgstr "" #: apt-pkg/indexcopy.cc:261 #, c-format msgid "Wrote %i records.\n" -msgstr "S-au scris %i înregistrări.\n" +msgstr "" #: apt-pkg/indexcopy.cc:263 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "S-au scris %i înregistrări cu %i fişiere lipsă.\n" +msgstr "" #: apt-pkg/indexcopy.cc:266 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "S-au scris %i înregistrări cu %i fişiere nepotrivite\n" +msgstr "" #: apt-pkg/indexcopy.cc:269 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Deschidere %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Deschidere %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Deschidere fişier de configurare %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Conectare la %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" -msgstr " Instalat: " ++msgstr " Instalate: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Deschidere %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Recomandă" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Conexiune închisă prematur" ++ +#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" +#~ msgstr "" +#~ "Identificator vânzător '%s' necunoscut în linia %u din lista sursă %s" diff --combined po/ru.po index 5b36cc5ef,ab3c56f22..49cf76d38 --- a/po/ru.po +++ b/po/ru.po @@@ -1,8 -1,4 +1,8 @@@ +# translation of apt-ru.po to Russian # translation of apt_po_ru.po to Russian +# translation of apt_ru.po to Russian +# translation of apt_ru.po to Русский язык +# translation of ru.po to Russian # Russian messages for the apt suite. # Vadim Kutchin , 2002. # Ilgiz Kalmetev , 2002. @@@ -10,20 -6,20 +10,20 @@@ # Nikolai Prokoschenko , 2004. # Dmitry Astapov , 2004. # Dmitry Astapov , 2004. -# Yuri Kozlov , 2004, 2005. +# Yuri Kozlov , 2004, 2005. # msgid "" msgstr "" -"Project-Id-Version: apt_po_ru\n" +"Project-Id-Version: apt-ru\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-10-22 12:24+0400\n" -"Last-Translator: Yuri Kozlov \n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-02-09 19:50+0400\n" +"Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@@ -160,8 -156,8 +160,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s для %s %s скомпилирован %s %s\n" @@@ -239,6 -235,19 +239,21 @@@ msgstr " "tmp\n" "Подробности в страницах руководства apt-cache(8) и apt.conf(5).\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" -msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод." ++msgstr "" ++"Смена носителя: вставьте диск с меткой '%s' в устройство '%s' и нажмите " ++"ввод\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Непарные аргументы" @@@ -300,7 -309,7 +315,7 @@@ msgstr " " -c=? Читать указанный конфигурационный файл\n" " -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@@ -309,35 -318,34 +324,35 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Невозможно определить версию debconf. Он установлен?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Список расширений, допустимых для пакетов, слишком длинен" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Ошибка обработки каталога %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "" "Список расширений, допустимых для пакетов с исходными текстами, слишком " "длинен" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "" "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -378,7 -386,7 +393,7 @@@ " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Использование: apt-ftparchive [параметры] команда\n" +"Использование: apt-ftparchive [options] command\n" "Команды: packages binarypath [overridefile [pathprefix]]\n" " sources srcpath [overridefile [pathprefix]]\n" " contents path\n" @@@ -387,35 -395,33 +402,35 @@@ " clean config\n" "\n" "apt-ftparchive генерирует индексные файлы архивов Debian. Он поддерживает\n" -"множество стилей генерации: от полностью автоматического до функциональной " -"замены\n" -"программ dpkg-scanpackages и dpkg-scansources\n" +"множество стилей генерации: от полностью автоматической до замены функций\n" +"пакетов dpkg-scanpackages и dpkg-scansources\n" "\n" "apt-ftparchive генерирует файлы Package (списки пакетов) для дерева\n" -"каталогов, содержащих файлы .deb. Файл Package включает в себя управляющие\n" -"поля каждого пакета, а также хеш MD5 и размер файла. Значения управляющих\n" -"полей \"приоритет\" (Priority) и \"секция\" (Section) могут быть изменены с\n" -"помощью файла override.\n" +"каталогов, содержащих файлы .deb. Файл Package\n" +"включает в себя все управляющие записи всех пакетов. Кроме того, для " +"каждого\n" +"пакета указывает хэш MD5 и размер файла. Значения управляющих записей\n" +"\"приоритет\" (Priority) и \"секция\" (Section) могут быть изменены путём\n" +"указания файла переназначений (override)\n" "\n" "Кроме того, apt-ftparchive может генерировать файлы Sources из дерева\n" -"каталогов, содержащих файлы .dsc. Для указания файла override в этом \n" -"режиме можно использовать параметр --source-override.\n" +"каталогов, содержащих файлы .dsc.\n" +"Для указания файла override в этом режиме можно использовать\n" +"опцию --source-override.\n" "\n" "Команды 'packages' и 'sources' надо выполнять, находясь в корневом каталоге\n" "дерева, которое вы хотите обработать. BinaryPath должен указывать на место,\n" "с которого начинается рекурсивный обход, а файл переназначений (override)\n" "должен содержать записи о переназначениях управляющих полей. Если был " "указан\n" -"Pathprefix, то его значение добавляется к управляющим полям, содержащим\n" +"Pathprefix, то его значениt добавляется к управляющим полям, содержащим\n" "имена файлов. Пример использования для архива Debian:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" -"Параметры:\n" +"Опции:\n" " -h Этот текст\n" -" --md5 Управление генерацией MD5-хешей\n" +" --md5 Управление генерацией MD5-хэшей\n" " -s=? Указать файл переназначений (override) для пакетов с исходными " "текстами\n" " -q Не выводить сообщения в процессе работы\n" @@@ -424,13 -430,13 +439,13 @@@ " --contents Управление генерацией полного перечня содержимого пакетов\n" " (файла Contents)\n" " -c=? Использовать указанный конфигурационный файл\n" -" -o=? Указать произвольный параметр конфигурации" +" -o=? Указать произвольную опцию" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Совпадений не обнаружено" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "В группе пакетов `%s' отсутствуют некоторые файлы" @@@ -463,83 -469,83 +478,83 @@@ msgstr "В архиве нет Ð¿Ð¾Ð»Ñ msgid "Unable to get a cursor" msgstr "Невозможно получить курсор" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Не удалось прочитать каталог %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Не удалось прочитать атрибуты %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Ошибки относятся к файлу '" - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Не удалось проследовать по ссылке %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Не удалось совершить обход дерева" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Не удалось открыть %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Не удалось прочесть ссылку %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Не удалось удалить %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Не удалось создать ссылку %s на %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Превышен лимит в %sB в DeLink.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Не удалось получить атрибуты %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "В архиве нет поля package" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" @@@ -640,242 -646,264 +655,264 @@@ msgstr "Не удалось ÑƒÐ´Ð°Ð»Ð¸Ñ msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "д" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "но он не может быть установлен" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "но он не установлен" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "но он не будет установлен" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " или" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" +"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Исправление зависимостей..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " не удалось." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Невозможно скорректировать зависимости" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Невозможно минимизировать набор обновлений" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Готово" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install'." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Аутентификационное предупреждение не принято в внимание.\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Установить эти пакеты без проверки [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Некоторые пакеты невозможно аутентифицировать" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Существуют проблемы, а опция -y использована без --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" -"Внутренняя ошибка, InstallPackages была вызвана с неработоспособными " -"пакетами!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Внутренняя ошибка, Ordering не завершилась" ++msgstr "Внутренняя ошибка при добавлении diversion" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог для загрузки" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org" ++msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо скачать %sB/%sB архивов.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо скачать %sБ архивов.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "После распаковки объем занятого дискового пространства возрастёт на %sB.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" "После распаковки объем занятого дискового пространства уменьшится на %sB.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "Не удалось определить количество свободного места в %s" ++msgstr "Недостаточно места в %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " "операция." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"То, что вы хотите сделать, может иметь нежелательные последствия.\n" +"То, что вы хотите сделать, может иметь нежелательные последствия\n" "Чтобы продолжить, введите фразу: '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Аварийное завершение." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось загрузить %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -883,48 -911,48 +920,48 @@@ msgstr " "Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get " "update или попытаться повторить запуск с ключом --fix-missing" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Аварийное завершение установки." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Заметьте, вместо %2$s выбирается %1$s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакет %s не установлен, поэтому не может быть удалён\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Установлен]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Вы должны явно указать, какой именно вы хотите установить." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -935,49 -963,49 +972,49 @@@ msgstr " "Это может означать, что пакет отсутствует, устарел, или доступен из " "источников, не упомянутых в sources.list\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Однако следующие пакеты могут его заменить:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Для пакета %s не найдены кандидаты на установку" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Переустановка %s невозможна, он не загружается.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Релиз '%s' для '%s' не найден" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия '%s' для '%s' не найдена" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана версия %s (%s) для %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -985,27 -1013,27 +1022,46 @@@ msgstr " "Некоторые индексные файлы не загрузились, они были проигнорированы или " "вместо них были использованы старые версии" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Следующая информация возможно поможет Вам:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Внутренняя ошибка, AllUpgrade все поломал" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade все поломал" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Не могу найти пакет %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1013,7 -1041,7 +1069,7 @@@ msgstr " "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1024,7 -1052,7 +1080,7 @@@ msgstr " "или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n" "ещё не созданы или были удалены из Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1034,111 -1062,120 +1090,117 @@@ msgstr " "пакет просто не может быть установлен из-за ошибок в самом пакете.\n" "Необходимо послать отчёт об этой ошибке." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Следующая информация возможно поможет Вам:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Сломанные пакеты" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Настойчиво рекомендуемые пакеты:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Рассчёт обновлений... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Неудачно" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Готово" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "Внутренняя ошибка, решатель проблем всё поломал" ++msgstr "Внутренняя ошибка, AllUpgrade все поломал" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходными текстами для %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1147,7 -1184,7 +1209,7 @@@ msgstr " "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1156,32 -1193,32 +1218,32 @@@ msgstr " "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Поддерживаемые модули:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1433,9 -1470,9 +1495,9 @@@ msgid "Duplicate conf file %s/%s msgstr "Повторно указанный конфигурационный файл %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format +#, fuzzy, c-format msgid "Failed to write file %s" -msgstr "Не удалось записать в файл %s" +msgstr "Не удалось записать файл %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@@ -1489,8 -1526,8 +1551,9 @@@ msgstr "Файлы Ð·Ð°Ð¼ÐµÐ½ÑÑŽÑ‚ÑÑ msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s переписывает файл в пакете %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" @@@ -1520,9 -1557,9 +1583,9 @@@ msgid "The info and temp directories ne msgstr "Каталоги info и temp должны находиться на одной файловой системе" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Чтение списков пакетов" @@@ -1628,12 -1665,12 +1691,12 @@@ msgstr "Не могу найти пра msgid "Unparsable control file" msgstr "Не могу прочесть содержимое control-файла" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Невозможно прочесть базу %s с CD" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1641,28 -1678,33 +1704,34 @@@ msgstr " "Пожалуйста, используйте apt-cdrom, чтобы APT смог распознать данный CD. apt-" "get update не используется для добавления нового CD" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Ошибочный CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Невозможно размонтировать CD-ROM в %s, возможно он ещё используется." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Диск не найден." ++msgstr "Файл не найден" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Файл не найден" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Неправильный URI, локальный URI не должен начинаться с //" @@@ -1722,7 -1764,7 +1791,7 @@@ msgstr "Допустимое Ð²Ñ€ÐµÐ¼Ñ msgid "Server closed the connection" msgstr "Сервер прервал соединение" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Ошибка чтения" @@@ -1734,7 -1776,7 +1803,7 @@@ msgstr "Ответ переполниРmsgid "Protocol corruption" msgstr "Искажение протокола" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Ошибка записи" @@@ -1837,48 -1879,89 +1906,86 @@@ msgstr "Не удаётся ÑÐ¾Ð·Ð´Ð°Ñ msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Невозможно инициализировать соединение с %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Не удаётся соединиться с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Соединение с %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Не могу найти IP адрес для %s" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Временная ошибка при попытке получить IP адрес '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" "Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Невозможно соединиться с %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" -"E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение " -"работы." + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " -"ключа?!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Найдена как минимум одна неправильная подпись." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Не удалось выполнить " ++msgstr "Не могу получить доступ к файлу блокировки %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr "для проверки подписи (gnupg установлена?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Неизвестная ошибка при выполнении gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Следующие подписи неверные:\n" ++msgstr "Будут установлены следующие дополнительные пакеты:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Не удалось открыть канал для %s" +msgstr "Не могу породить процесс %s" #: methods/gzip.cc:102 #, c-format @@@ -1958,10 -2041,6 +2065,6 @@@ msgstr "Соединение разор msgid "Internal error" msgstr "Внутренняя ошибка" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Соединение закрыто преждевременно" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Невозможно отобразить в память пустой файл" @@@ -1976,59 -2055,59 +2079,59 @@@ msgstr "Невозможно отобр msgid "Selection %s not found" msgstr "Не найдено: %s" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестная аббревиатура типа: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Открытие файла конфигурации %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Строка %d слишком длинна (максимум %d)." - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтаксическая ошибка %s:%u: искажённый тэг" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем " "уровне" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла" @@@ -2094,7 -2173,7 +2197,7 @@@ msgstr "Неверная операци msgid "Unable to stat the mount point %s" msgstr "Невозможно прочитать атрибуты точки монтирования %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Невозможно сменить текущий каталог на %s" @@@ -2103,76 -2182,76 +2206,76 @@@ msgid "Failed to stat the cdrom" msgstr "Невозможно получить атрибуты cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s доступен только для " "чтения" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Не могу открыть файл блокировки %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s находится на файловой " "системе nfs" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Не могу получить доступ к файлу блокировки %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Порождённый процесс %s вернул код ошибки (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Не могу открыть файл %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Проблема закрытия файла" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Ошибка при удалении файла" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файловых буферов с диском" @@@ -2245,18 -2324,18 +2348,28 @@@ msgstr "необязательный msgid "extra" msgstr "дополнительный" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Построение дерева зависимостей" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Версии-кандидаты" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Генерирование зависимостей" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Объединение информации о доступных пакетах" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Не удалось записать файл %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2267,53 -2346,53 +2380,53 @@@ msgstr "Невозможно проче msgid "Unable to parse package file %s (2)" msgstr "Невозможно прочесть содержимое пакета %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Открытие %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Неизвестен тип '%s' в строке %u в списке источников %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Искажённая строка %u в списке источников %s (vendor id)" @@@ -2335,13 -2414,13 +2448,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Не поддерживается индексный файл типа '%s'" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Пакет %s нуждается в переустановке, но я не могу найти архив для него." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2349,36 -2428,46 +2462,48 @@@ msgstr " "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " "может быть вызвано отложенными (held) пакетами." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у Вас отложены (held) битые пакеты." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Каталог %spartial отсутствует." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Архивный каталог %spartial отсутствует." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Загружается файл %li из %li (%s осталось)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Драйвер для метода %s не найден." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод." ++msgstr "" ++"Смена носителя: вставьте диск с меткой '%s' в устройство '%s' и нажмите " ++"ввод\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Менеджер пакетов '%s' не поддерживается" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Невозможно определить подходящий тип менеджера пакетов" @@@ -2412,82 -2501,82 +2537,82 @@@ msgstr "Неизвестный тип Ñ msgid "No priority (or zero) specified for pin" msgstr "Для фиксации не указан приоритет (или указан нулевой)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Кэш имеет несовместимую систему версий" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Произошла ошибка во время обработки %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Произошла ошибка во время обработки %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Произошла ошибка во время обработки %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Произошла ошибка во время обработки %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Произошла ошибка во время обработки %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Произошла ошибка во время обработки %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Превышено допустимое количество имён пакетов." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Превышено допустимое количество версий." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Превышено допустимое количество зависимостей." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Произошла ошибка во время обработки %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов с исходными текстами %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш исходных текстов" @@@ -2496,11 -2585,11 +2621,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2509,7 -2598,7 +2634,7 @@@ msgstr " "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет (возможно, пропущен arch)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2518,13 -2607,13 +2643,13 @@@ msgstr " "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Не совпадает размер" @@@ -2533,7 -2622,7 +2658,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2542,49 -2631,49 +2667,49 @@@ msgstr " "В качестве точки монтирования CD-ROM используется %s\n" "Монтируется CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Идентификация.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Найдена метка: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Использование %s в качестве точки монтирования CD-ROM\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Размонтирование CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Ожидание операции работы с диском...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Монтирование CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Поиск на диске индексных файлов..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" "Найдено индексов: %i для пакетов, %i для пакетов c исходными текстами\n" "и %i для сигнатур\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Это неправильное имя, попробуйте ещё раз.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2593,19 -2682,19 +2718,19 @@@ msgstr " "Название диска: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Копирование списков пакетов..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Запись нового списка источников\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Размонтирование CD-ROM..." @@@ -2629,4 -2718,58 +2754,58 @@@ msgstr "Сохранено %i Ð·Ð°Ð¿Ð¸Ñ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими " -"файлами\n" +"файлами.\n" + + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Подготавливается %s" ++msgstr "Открытие %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Распаковывается %s" ++msgstr "Открытие %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Подготавливается для конфигурации %s" ++msgstr "Открытие файла конфигурации %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Настройка %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "Установлен %s" ++msgstr " Установлен: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Подготавливается для удаления %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Удаление %s" ++msgstr "Открытие %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "Удалён %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Подготавливается для удаления вместе с настройками %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "Удалён вместе с настройками %s" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Соединение закрыто преждевременно" diff --combined po/sk.po index dd7cb2636,160da405e..e57f708aa --- a/po/sk.po +++ b/po/sk.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-07-01 09:34+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pre %s %s skompilovaný na %s %s\n" @@@ -227,6 -227,22 +227,22 @@@ msgstr " " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" "Viac informácií nájdete v manuálových stránkach apt-cache(8) a apt.conf(5).\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Výmena média: Vložte disk nazvaný\n" + " '%s'\n" + "do mechaniky '%s' a stlačte Enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenty nie sú vo dvojiciach" @@@ -288,7 -304,7 +304,7 @@@ msgstr " " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Do %s sa nedá zapisovaÅ¥" @@@ -297,31 -313,31 +313,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nedá sa určiÅ¥ verzia programu debconf. Je debconf nainÅ¡talovaný?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Zoznam rozšírení balíka je príliÅ¡ dlhý" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Chyba pri spracovávaní adresára %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Zoznam zdrojových rozšírení je príliÅ¡ dlhý" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Chyba pri zapisovaní hlavičky do súboru" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Chyba pri spracovávaní obsahu %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -401,11 -417,11 +417,11 @@@ msgstr " " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Nevyhovel žiaden výber" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "V balíkovom súbore skupiny `%s' chýbajú niektoré súbory" @@@ -438,83 -454,83 +454,83 @@@ msgstr "Archív nemá riadiaci záznam msgid "Unable to get a cursor" msgstr "Nedá sa získaÅ¥ kurzor" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Adresár %s sa nedá čítaÅ¥\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s sa nedá vyhodnotiÅ¥\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E: Chyby sa týkajú súboru " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Chyba pri zisÅ¥ovaní %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Priechod stromom zlyhal" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "%s sa nedá otvoriÅ¥" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr "Odlinkovanie %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Linka %s sa nedá čítaÅ¥" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "%s sa nedá odlinkovaÅ¥" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nepodarilo sa zlinkovaÅ¥ %s s %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Bol dosiahnutý odlinkovací limit %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "%s sa nedá vyhodnotiÅ¥" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archív neobsahuje pole package" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žiadnu položku pre override\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správcom %s je %s, nie %s\n" @@@ -614,79 -630,79 +630,79 @@@ msgstr "Problém s odlinkovaním %s msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "ale nainÅ¡talovaný je %s" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "ale inÅ¡talovaÅ¥ sa bude %s" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "ale sa nedá nainÅ¡talovaÅ¥" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "ale nie je nainÅ¡talovaný" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "ale sa nebude inÅ¡talovaÅ¥" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " alebo" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "NainÅ¡talujú sa nasledovné NOVÉ balíky:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -695,122 -711,144 +711,144 @@@ msgstr " "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových inÅ¡talovaných, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinÅ¡talovaných, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainÅ¡talovaných alebo odstránených.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Opravujú sa závislosti..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " zlyhalo." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Závislosti sa nedajú opraviÅ¥" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Sada pre aktualizáciu sa nedá minimalizovaÅ¥" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Hotovo" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Na opravu môžete spustiÅ¥ `apt-get -f install'." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste použiÅ¥ -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiÅ¥ vierohodnosÅ¥!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "NainÅ¡talovaÅ¥ tieto nekontrolované balíky [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Nedala sa zistiÅ¥ vierohodnoÅ¥ niektorých balíkov" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Nastali problémy a -y bolo použité bez --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia OdstrániÅ¥ je vypnutá." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Vnútorná chyba pri pridávaní diverzie" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Adresár pre sÅ¥ahovanie sa nedá zamknúť" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nedá sa načítaÅ¥ zoznam zdrojov." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB/%sB archívov.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB archívov.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení sa na disku použije ďalších %sB.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení sa na disku uvoľní %sB.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Na %s nemáte dostatok voľného miesta" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatok voľného miesta." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -821,28 -859,28 +859,28 @@@ msgstr " "Pre pokračovanie opíšte frázu '%s'\n" " ?]" - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "PreruÅ¡ené." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovaÅ¥ [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuÅ¥" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "SÅ¥ahovanie ukončené v režime \"iba stiahnuÅ¥\"" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -850,47 -888,47 +888,47 @@@ msgstr " "Niektoré archívy sa nedajú stiahnuÅ¥. Skúste spustiÅ¥ apt-get update alebo --" "fix-missing" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výmena média nie sú momentálne podporované" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Chýbajúce balíky sa nedajú opraviÅ¥." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "InÅ¡talácia sa preruÅ¡uje." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Poznámka: %s sa vyberá namiesto %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Preskakuje sa %s, pretože je už nainÅ¡talovaný.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s nie je nainÅ¡talovaný, nedá sa teda odstrániÅ¥\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuálny balík poskytovaný:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "[InÅ¡talovaný]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Mali by ste explicitne vybraÅ¥ jeden na inÅ¡taláciu." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -900,49 -938,49 +938,49 @@@ msgstr " "Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n" "že balík chýba, bol zruÅ¡ený, alebo je dostupný iba z iného zdroja\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "AvÅ¡ak nahrádzajú ho nasledovné balíky:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta na inÅ¡taláciu" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nie je možná reinÅ¡talácia %s, pretože sa nedá stiahnuÅ¥.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je už najnovÅ¡ej verzie.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebolo nájdené vydanie '%s' pre '%s'" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebola nájdená verzia '%s' pre '%s'" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Zvolená verzia %s (%s) pre %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -950,25 -988,25 +988,44 @@@ msgstr " "Niektoré indexové súbory sa nepodarilo stiahnuÅ¥, boli ignorované, alebo sa " "použili starÅ¡ie verzie." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Nasledovné informácie vám možno pomôžu vyrieÅ¡iÅ¥ túto situáciu:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Vnútorná chyba, AllUpgrade pokazil veci" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsÅ¥" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Na opravu nasledovných môžete spustiÅ¥ `apt-get -f install':" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -976,7 -1014,7 +1033,7 @@@ msgstr " "Nesplnené závislosti. Skúste spustiÅ¥ 'apt-get -f install' bez balíkov (alebo " "navrhnite rieÅ¡enie)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -988,7 -1026,7 +1045,7 @@@ msgstr " "požadované balíky eÅ¡te neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -998,114 -1036,124 +1055,120 @@@ msgstr " "balík nie je inÅ¡talovateľný a mali by ste zaslaÅ¥ hlásenie o chybe\n" "(bug report) pre daný balík." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Nasledovné informácie vám možno pomôžu vyrieÅ¡iÅ¥ túto situáciu:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "PoÅ¡kodené balíky" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "NainÅ¡talujú sa nasledovné extra balíky:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Navrhované balíky:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Odporúčané balíky:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Chyba" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Hotovo" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Vnútorná chyba, AllUpgrade pokazil veci" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadaÅ¥ aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsÅ¥ zdrojový balík pre %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB/%sB zdrojových archívov.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB zdrojových archívov.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "StiahnuÅ¥ zdroj %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Proces potomka zlyhal" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadaÅ¥ aspoň jeden balík, pre ktorý sa budú overovaÅ¥ závislosti na " "zostavenie" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získaÅ¥ závislosti pre zostavenie %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosÅ¥ pre %s sa nemôže splniÅ¥, pretože sa nedá nájsÅ¥ balík %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1114,31 -1162,31 +1177,31 @@@ msgstr " "%s závislosÅ¥ pre %s sa nedá splniÅ¥, protože sa nedá nájsÅ¥ verzia balíku %s, " "ktorá zodpovedá požiadavke na verziu" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Zlyhalo splnenie %s závislosti pre %s: InÅ¡talovaný balík %s je príliÅ¡ nový" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniÅ¥." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Podporované moduly:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1443,8 -1491,8 +1506,9 @@@ msgstr "PrepísaÅ¥ zodpovedajúci balí msgid "File %s/%s overwrites the one in the package %s" msgstr "Súbor %s/%s prepisuje ten z balíka %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s sa nedá čítaÅ¥" @@@ -1474,9 -1522,9 +1538,9 @@@ msgid "The info and temp directories ne msgstr "Adresáre info a temp musia byÅ¥ na tom istom súborovom systéme" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Načítavajú sa zoznamy balíkov" @@@ -1584,12 -1632,12 +1648,12 @@@ msgstr "Nedá sa nájsÅ¥ platný riadia msgid "Unparsable control file" msgstr "Nespracovateľný riadiaci súbor" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Nedá sa čítaÅ¥ databáza na cdrom %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1597,28 -1645,34 +1661,34 @@@ msgstr " "Pre pridanie CD do APT použijte apt-cdrom. apt-get update sa nedá využiÅ¥ na " "pridávanie nových CD." - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Chybné CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nedá sa odpojiÅ¥ CD-ROM v %s - možno sa eÅ¡te používa." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Súbor nebol nájdený" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Súbor nebol nájdený" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Neplatné URI, lokálne URI nesmie začínaÅ¥ s //" @@@ -1676,7 -1730,7 +1746,7 @@@ msgstr "Uplynul čas spojenia msgid "Server closed the connection" msgstr "Server ukončil spojenie" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba pri čítaní" @@@ -1688,7 -1742,7 +1758,7 @@@ msgstr "Odpoveď preplnila zásobník. msgid "Protocol corruption" msgstr "NaruÅ¡enie protokolu" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba pri zápise" @@@ -1789,43 -1843,81 +1859,81 @@@ msgstr "Nedá sa vytvoriÅ¥ socket pre % msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nedá sa nadviazaÅ¥ spojenie na %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nedá sa pripojiÅ¥ k %s:%s (%s), uplynul čas spojenia" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nedá sa pripojiÅ¥ k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Pripája sa k %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Nedá sa zistiÅ¥ '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Dočasné zlyhanie pri zisÅ¥ovaní '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Niečo veľmi zlé sa prihodilo pri zisÅ¥ovaní '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nedá sa pripojiÅ¥ k %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Zámok %s sa nedá získaÅ¥" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "NainÅ¡talujú sa nasledovné extra balíky:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1909,10 -2001,6 +2017,6 @@@ msgstr "Spojenie zlyhalo msgid "Internal error" msgstr "Vnútorná chyba" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Spojenie bolo predčasne ukončené" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Nedá sa vykonaÅ¥ mmap prázdneho súboru" @@@ -1927,58 -2015,58 +2031,58 @@@ msgstr "Nedá sa urobiÅ¥ mmap %lu bajto msgid "Selection %s not found" msgstr "Voľba %s nenájdená" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nerozpoznaná skratka typu: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Otvára sa konfiguračný súbor %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Riadok %d je príliÅ¡ dlhý (nanajvýš %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Skomolená značka" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaktická chyba %s:%u: Direktívy sa dajú vykonaÅ¥ len na najvyÅ¡Å¡ej úrovni" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaktická chyba %s:%u: PríliÅ¡ mnoho vnorených prepojení (include)" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje" @@@ -2044,7 -2132,7 +2148,7 @@@ msgstr "Neplatná operácia %s msgid "Unable to stat the mount point %s" msgstr "Prípojný bod %s sa nedá vyhodnotiÅ¥" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nedá sa prejsÅ¥ do %s" @@@ -2053,70 -2141,70 +2157,70 @@@ msgid "Failed to stat the cdrom" msgstr "Nedá sa vyhodnotiÅ¥ cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Zamykanie pre zámkový súbor %s, ktorý je iba na čítanie, sa nepoužíva" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Zámkový súbor %s sa nedá otvoriÅ¥" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Zamykanie pre zámkový súbor %s pripojený cez nfs sa nepoužíva" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Zámok %s sa nedá získaÅ¥" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržal chybu segmentácie." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočakávane skončil" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Súbor %s sa nedá otvoriÅ¥ súbor" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "čítanie, stále treba prečítaÅ¥ %lu, ale už nič neostáva" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále treba zapísaÅ¥ %lu, no nedá sa to" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problém pri zatváraní súboru" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Problém pri odstraňovaní súboru" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" @@@ -2189,18 -2277,18 +2293,28 @@@ msgstr "voliteľný msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Vytvára sa strom závislostí" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandidátske verzie" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Generovanie závislostí" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Zlučujú sa dostupné informácie" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Zápis do súboru %s zlyhal" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2211,52 -2299,52 +2325,52 @@@ msgstr "Súbor %s sa nedá spracovaÅ¥ ( msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovaÅ¥ (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (Absolútny dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliÅ¡ dlhý." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)" @@@ -2277,13 -2365,13 +2391,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indexový typ súboru '%s' nie je podporovaný" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Je nutné preinÅ¡talovaÅ¥ balík %s, ale nemôžem pre neho nájsÅ¥ archív." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2291,36 -2379,49 +2405,49 @@@ msgstr " "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " "pridržanými balíkmi." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviÅ¥, niektoré balíky držíte v naruÅ¡enom stave." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Adresár zoznamov %spartial chýba." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archívny adresár %spartial chýba." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Nedá sa nájsÅ¥ ovládač spôsobu %s." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Spôsob %s nebol správne spustený" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Výmena média: Vložte disk nazvaný\n" + " '%s'\n" + "do mechaniky '%s' a stlačte Enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' nie je podporovaný" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nedá sa určiÅ¥ vhodný typ balíčkovacieho systému" @@@ -2354,84 -2455,84 +2481,84 @@@ msgstr "Nezrozumiteľné pripevnenie ty msgid "No priority (or zero) specified for pin" msgstr "Pre pripevnenie nebola zadaná žiadna (alebo nulová) priorita" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Chyba pri spracovaní %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Chyba pri spracovaní %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Chyba pri spracovaní %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Chyba pri spracovaní %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Chyba pri spracovaní %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Chyba pri spracovaní %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Chyba pri spracovaní %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovaÅ¥." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovaÅ¥." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovaÅ¥." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba pri spracovaní %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Chyba pri spracovaní %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nedá sa vyhodnotiÅ¥ zoznam zdrojových balíkov %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" @@@ -2440,11 -2541,11 +2567,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súčtov" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2453,7 -2554,7 +2580,7 @@@ msgstr " "Nedá sa nájsÅ¥ súbor s balíkom %s. To by mohlo znamenaÅ¥, že tento balík je " "potrebné opraviÅ¥ manuálne (kvôli chýbajúcej architektúre)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2462,13 -2563,13 +2589,13 @@@ msgstr " "Nedá sa nájsÅ¥ súbor s balíkom %s. Asi budete musieÅ¥ opraviÅ¥ tento balík " "manuálne." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Indexové súbory balíka sú naruÅ¡ené. Chýba pole Filename: pre balík %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@@ -2477,7 -2578,7 +2604,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2486,48 -2587,48 +2613,48 @@@ msgstr " "Použije sa CD-ROM prípojný bod %s\n" "Pripája sa CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identifikuje sa.." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Uložená menovka: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Použije sa CD-ROM prípojný bod %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM sa odpája\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Čaká sa na disk...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Pripája sa CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Na disku sa hľadajú indexové súbory..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" "Nájdených %i indexov balíkov, %i indexov zdrojových balíkov a %i signatúr\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Neplatný názov, skúste znova.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2536,19 -2637,19 +2663,19 @@@ msgstr " "Názov tohto disku je: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kopírujú sa zoznamy balíkov..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Zapisuje sa nový zoznam zdrojov\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "CD-ROM sa odpája..." @@@ -2572,5 -2673,59 +2699,59 @@@ msgstr "Zapísaných %i záznamov s %i msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Otvára sa %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Otvára sa %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Otvára sa konfiguračný súbor %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Pripája sa k %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " NainÅ¡talovaná verzia: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Otvára sa %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Odporúča" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Spojenie bolo predčasne ukončené" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Neznáme ID výrobcu '%s' na riadku %u v zdrojovom zozname %s" diff --combined po/sl.po index ad8aea470,6e6a46613..c7f512189 --- a/po/sl.po +++ b/po/sl.po @@@ -4,7 -4,7 +4,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Èuhalev \n" "Language-Team: Slovenian \n" @@@ -144,8 -144,8 +144,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" @@@ -224,6 -224,22 +224,22 @@@ msgstr " " -o=? Nastavi poljubno nastavitveno mo¾nost, npr. -o dir::cache=/tmp\n" "Za veè informacij si oglejte strani man apt-cache(8) in apt.conf(5).\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "Sprememba medija: vstavite disk z oznako\n" + " '%s'\n" + "v enoto '%s' in pritisnite enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Argumenti niso v parih" @@@ -285,7 -301,7 +301,7 @@@ msgstr " " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno mo¾nost, npr. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoèe pisati na %s" @@@ -294,31 -310,31 +310,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni mogoèe ugotoviti razlièice debconfa. Je sploh name¹èen?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Seznam raz¹iritev paketov je predolg" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Napaka pri obdelavi imenika %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Seznam raz¹iritev virov je predolg" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Napaka pri pisanju glave v vsebinsko datoteko" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Napaka pri obdelavi vsebine %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -399,11 -415,11 +415,11 @@@ msgstr " " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno mo¾nost" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Nobena izbira se ne ujema" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Nekatere datoteke manjkajo v skupini paketnih datotek '%s'" @@@ -436,83 -452,83 +452,83 @@@ msgstr "Arhiv nima nadzornega zapisa msgid "Unable to get a cursor" msgstr "Ni mogoèe najti kazalca" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "O: ni mogoèe brati imenika %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "O: Ni mogoèe nastaviti %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "O: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "N: Napake se sklicujejo na datoteko" - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Ni mogoèe razre¹iti %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Hoja drevesa ni uspela" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Ni mogoèe odprti %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " RazVe¾i %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Napaka pri branju povezave %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Napaka pri odvezovanju %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Napaka pri povezovanju %s z %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Dose¾ena meja RazVezovanja %sB.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Napaka pri postavitvi %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prekrivnega vnosa\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdr¾evalec %s je %s in ne %s\n" @@@ -612,79 -628,79 +628,79 @@@ msgstr "Napaka pri odvezovanju %s msgid "Failed to rename %s to %s" msgstr "Ni mogoèe preimenovati %s v %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nere¹ene odvisnosti:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s name¹èen" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s name¹èen" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "vendar ni name¹èen" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "vendar ne bo name¹èen" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " ali" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo name¹èeni:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadr¾ani:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Naslednji zadr¾ani paketi bodo spremenjeni:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -693,122 -709,144 +709,144 @@@ msgstr " "OPOZORILO: Naslednji kljuèni paketi bodo odstranjeni.\n" "To NI priporoèljivo, razen èe natanèno veste, kaj poènete." --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo name¹èenih, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma name¹èenih ali odstranjenih.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Popravljanje odvisnosti ..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " spodletelo." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Ni mogoèe popraviti odvisnosti" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Ni mogoèe pomanj¹ati zbirke za nadgradnjo" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Opravljeno" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Èe ¾elite popraviti napake, poskusite pognati 'apt-get -f install'." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Nere¹ene odvisnosti. Poskusite uporabiti -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "POZORO: Naslednjih paketov ni bilo mogoèe avtenticirati!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Namestim te pakete brez prevejanje [y/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Nisem uspel avtenticirati nekaterih paketkov" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Pri¹lo je do te¾av in -y je bil uporabljen brez --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoèeno." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "Notranja napaka pri dodajanju odklona" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Ni mogoèe zakleniti imenika za prenose" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoèe brati." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potrebno je dobiti %sB/%sB arhivov.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potrebno je dobiti %sB arhivov.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "Nimate dovolj prostora na %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s je premalo prostora." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Izbrana je mo¾nost Samo preprosto, a to opravilo ni preprosto." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -819,28 -857,28 +857,28 @@@ msgstr " "Za nadaljevanje vnesite frazo '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Prekini." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Ali ¾elite nadaljevati [Y/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoèe dobiti %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Prenos dokonèan in uporabljen naèin samo prenos" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -848,47 -886,47 +886,47 @@@ msgstr " "Nekaterih arhivov ni mogoèe dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Ni mogoèe popraviti manjkajoèih paketov." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Prekinjanje namestitve." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Opomba: izbran %s namesto %s \n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s preskoèen, ker je ¾e name¹èen in ne potrebuje nadgradnje.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ni name¹èen, zato ni odstranjen\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je navidezen in ga je priskrbel:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Name¹èeno]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Sami izberite paket, ki ga ¾elite namestiti." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -899,49 -937,49 +937,49 @@@ msgstr " "To ponavadi pomeni, da paket manjka, je zastaran ali\n" "pa je na voljo samo iz drugega vira.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Kakorkoli, naslednji paketi ga nadomestijo:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s nima kandidata za namestitev" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna namestitev %s ni mo¾na, ker ni mo¾en prenos.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "Najnovej¹a razlièica %s je ¾e name¹èena.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoèe najti" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Razlièice '%s' za '%s' ni mogoèe najti" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razlièica %s (%s) za %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoèe zakleniti" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -949,25 -987,25 +987,44 @@@ msgstr " "Nekaterih kazal ni mogoèe prenesti, zato so preklicana, ali pa so " "uporabljena starej¹a." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Notranja napaka zaradi AllUpgrade." ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoèe najti paketa %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', èe ¾elite popraviti:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -975,7 -1013,7 +1032,7 @@@ msgstr " "Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte re¹itev)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -986,7 -1024,7 +1043,7 @@@ msgstr " "nemogoè polo¾aj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -996,115 -1034,125 +1053,121 @@@ msgstr " "preprosto ne da namestiti in je potrebno vlo¾iti poroèilo o hro¹èu\n" "o tem paketu." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Pokvarjeni paketi" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo name¹èeni:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Predlagani paketi:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Priporoèeni paketi:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Preraèunavanje nadgradnje ... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Spodletelo" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Opravljeno" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "Notranja napaka zaradi AllUpgrade." + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega ¾elite dobiti izorno kodo" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoèe najti" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoèe dobiti." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Otro¹ki proces ni uspel" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega ¾elite preveriti odvisnosti " "za gradnjo" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoèe zadostiti, ker ni mogoèe najti paketa %s" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1113,31 -1161,31 +1176,31 @@@ msgstr " "%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne " "more zadostiti zahtevi po razlièici" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoèe zadostiti %s odvisnosti za %s. Name¹èen paket %s je preveè nov" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoèe zadostiti %s odvisnosti za %s. %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Podprti moduli:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1444,8 -1492,8 +1507,9 @@@ msgstr "Prepi¹i zadetek paketa brez vno msgid "File %s/%s overwrites the one in the package %s" msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ni mogoèe brati %s" @@@ -1475,9 -1523,9 +1539,9 @@@ msgid "The info and temp directories ne msgstr "Podatki in zaèasni imeniki morajo biti v istem datoteènem sistemu" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Branje seznama paketov" @@@ -1583,12 -1631,12 +1647,12 @@@ msgstr "Ni mogoèe najti veljavne nadzor msgid "Unparsable control file" msgstr "Nadzorne datoteke ni mogoèe razèleniti" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Ni mogoèe brati zbirke %s na CD-ROM-u" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1596,28 -1644,34 +1660,34 @@@ msgstr " "Uporabite apt-cdrom, èe ¾elite, da APT prepozna CD. apt-get update ne more " "sam dodati novih CD-jev" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Napaèen C" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Ni mogoèe odklopiti CD-ROM-a v %s, ker je morda ¹e v uporabi." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "Datoteke ni mogoèe najti" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datoteke ni mogoèe najti" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Doloèitev ni uspela" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Nastavitev èasa spremembe ni uspela" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Napaèen URI. Lokalni URI-ji se morajo zaèeti z /" @@@ -1675,7 -1729,7 +1745,7 @@@ msgstr "Povezava potekla msgid "Server closed the connection" msgstr "Stre¾nik je zaprl povezavo" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Napaka pri branju" @@@ -1687,7 -1741,7 +1757,7 @@@ msgstr "Odgovor je prekoraèil vmesnik. msgid "Protocol corruption" msgstr "Okvara protokola" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Napaka pri pisanju" @@@ -1788,43 -1842,81 +1858,81 @@@ msgstr "Ni mogoèe ustvariti vtiènice z msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni mogoèe zaèeti povezave z %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Ni se mogoèe povezati z %s:%s (%s). Povezava potekla." - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Ni se mogoèe povezati z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se z %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Ni mogoèe razre¹iti '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Zaèasna napaka pri razre¹evanju '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Pri¹lo je do napake pri razre¹evanju '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ni se mogoèe povezati z %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "Ni mogoèe dobiti zaklenjene datoteke %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "Naslednji dodatni paketi bodo name¹èeni:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1908,10 -2000,6 +2016,6 @@@ msgstr "Povezava ni uspela msgid "Internal error" msgstr "Notranja napaka" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Povezava se je prezgodaj zaprla" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "mmap prazne datoteke ni mogoè" @@@ -1926,58 -2014,58 +2030,58 @@@ msgstr "Ni mogoèe narediti mmap %lu baj msgid "Selection %s not found" msgstr "Izbira %s ni mogoèe najti" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ne-prepoznan tip okraj¹ave: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Odpiranje nastavitvene datoteke %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Vrstica %d je predolga (najveè %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Skladenjska napaka %s:%u: Blok se zaène brez imena." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Skladenjska napaka %s:%u: Nepravilna znaèka." - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Skladenjska napaka %s:%u: Dodatno smetje za vrednostjo." - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnjem nivoju." - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Skladenjska napaka %s:%u: Preveè ugnezdenih vkljuèitev." - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Skladenjska napaka %s:%u: Vkljuèen od tu." - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke" @@@ -2043,7 -2131,7 +2147,7 @@@ msgstr "Napaèna operacija %s msgid "Unable to stat the mount point %s" msgstr "Ni mogoèe doloèiti priklopne toèke %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ni mogoèe spremeniti v %s" @@@ -2052,70 -2140,70 +2156,70 @@@ msgid "Failed to stat the cdrom" msgstr "Ni mogoèe doloèiti CD-ROM-a" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko samo za branje %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Ni mogoèe odprti zaklenjene datoteke %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Ni mogoèe dobiti zaklenjene datoteke %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Èakal, a %s ni bil tam" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Napaka pri razèlenjenosti podprocesa %s." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s je vrnil kodo napake (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s se je neprièakovano zakljuèil" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Ne morem odpreti datoteke %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "berem, ¹e vedno %lu za branje, a nobeden ostal" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "pi¹em, ¹e vedno %lu za pisanje, a ni mogoèe" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Te¾ava pri zapiranju datoteke" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Te¾ava pri odvezovanju datoteke" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Te¾ava pri usklajevanju datoteke" @@@ -2188,18 -2276,18 +2292,28 @@@ msgstr "izbirno msgid "extra" msgstr "dodatno" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Gradnja drevesa odvisnosti" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Razlièice kandidatov" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Spajanje informacij na voljo" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Napaka pri pisanju datoteke %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2210,52 -2298,52 +2324,52 @@@ msgstr "Ni mogoèe razèleniti paketne da msgid "Unable to parse package file %s (2)" msgstr "Ni mogoèe razèleniti paketne datoteke %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Napaèna vrstica %lu v seznamu virov %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Napaèna vrstica %lu v seznamu virov %s (distribucija)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Napaèna vrstica %lu v seznamu virov %s (razèlenitev URI)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Napaèna vrstica %lu v seznamu virov %s (absolutna distribucija)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Napaèna vrstica %lu v seznamu virov %s (razèlenitev distribucije)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Odpiram %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Napaèna vrstica %u v seznamu virov %s (vrsta)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Napaèna vrstica %u v seznamu virov %s (ID ponudnika)" @@@ -2276,14 -2364,14 +2390,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Vrsta datoteke s kazalom '%s' ni podprta" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Paket %s mora biti ponovno name¹èen, vendar ne morem najti arhiva zanj." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2291,36 -2379,49 +2405,49 @@@ msgstr " "Napaka. pkgProblemResolver::Napake pri razre¹itvi, ki so jih morda " "povzroèili zadr¾ani paketi." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoèe popraviti te¾av. Imate zadr¾ane pakete." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Manjka imenik s seznami %spartial." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Manjka imenik z arhivi %spartial." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ni mogoèe najti gonilnika metod %s." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s se ni zaèela pravilno" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "Sprememba medija: vstavite disk z oznako\n" + " '%s'\n" + "v enoto '%s' in pritisnite enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketni sistem '%s' ni podprt" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Ni mogoèe ugotoviti ustrezne vrste paketnega sistema" @@@ -2354,82 -2455,82 +2481,82 @@@ msgstr "Ni mogoèe razumeti vrste zaponk msgid "No priority (or zero) specified for pin" msgstr "Prioriteta zaponke ni doloèena ali pa je niè." --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Predpomnilnik ima neustrezen sistem razlièic" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nov paket)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Uau, presegli ste ¹tevilo imen paketov, ki jih zmore APT." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Uau, presegli ste ¹tevilo razlièic, ki jih zmore APT." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Uau, presegli ste ¹tevilo odvisnosti, ki jih zmore APT." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Pri¹lo je do napake pri obdelavi %s (Najdi paket)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Pri¹lo je do napake pri obdelavi %s (Zberi dobavitelje datotek)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoèe najti med obdelavo odvisnosti" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoèe doloèiti seznama izvornih paketov %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "Napaka IO pri shranjevanju predpomnilnika virov" @@@ -2438,11 -2539,11 +2565,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2451,7 -2552,7 +2578,7 @@@ msgstr " "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno " "popraviti ta paket (zaradi manjkajoèega arhiva)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2460,7 -2561,7 +2587,7 @@@ msgstr " "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno " "popraviti ta paket." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2468,7 -2569,7 +2595,7 @@@ msgstr " "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@@ -2477,7 -2578,7 +2604,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Ponudnikov blok %s ne vsebuje podpisa" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2486,47 -2587,47 +2613,47 @@@ msgstr " "Uporabljam CD-ROM priklopno toèko %s\n" "Priklapljam CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identificiram.." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Shranjena oznaka: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Uporabljam CD-ROM priklopno toèko %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Odklapljam CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Èakam na medij...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Priklapljam CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Preverjam medij za datoteke s kazalom..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Na¹el sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "To ni veljavno ime, poskusite ¹e enkrat.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2535,19 -2636,19 +2662,19 @@@ msgstr " "Ta medij se imenuje: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kopiranje seznama paketov..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Pi¹em nov seznam virov\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta medij so:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Odklapljam CD-ROM..." @@@ -2573,5 -2674,59 +2700,59 @@@ msgstr " "Zapisal %i zapisov z %i manjkajoèimi datotekami in %i neujemajoèimi " "datotekami.\n" + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "Odpiram %s" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "Odpiram %s" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "Odpiranje nastavitvene datoteke %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "Povezujem se z %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr " Name¹èen: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "Odpiram %s" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "Priporoèa" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Povezava se je prezgodaj zaprla" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Neznan ID ponudnika '%s' v vrstici %u v seznamu virov %s" diff --combined po/sv.po index 367f6680e,b93c051fe..db12e7d44 --- a/po/sv.po +++ b/po/sv.po @@@ -1,16 -1,14 +1,16 @@@ -# Advanced Package Tool - APT message translation catalog -# Swedish messages -# Peter Karlsson , 2002-2005. -# +# Advanced Package Tool - APT message translation catalog +# Swedish messages +# Peter Karlsson , 2002-2005. +# Based on Danish messages +# Claus Hindsgaul , 2002. +# msgid "" msgstr "" -"Project-Id-Version: apt\n" +"Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-11-02 23:56+0100\n" -"Last-Translator: Daniel Nylander \n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-01-15 15:30+0100\n" +"Last-Translator: Peter Karlsson \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@@ -105,7 -103,7 +105,7 @@@ msgstr "\"Package\"-filer: msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cachen är ur synk, kan inte korsreferera en paketfil" -# Prioritet följt av URI +# Prioritet följt av URI #: cmdline/apt-cache.cc:1470 #, c-format msgid "%4i %s\n" @@@ -149,8 -147,8 +149,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s för %s %s kompilerad den %s %s\n" @@@ -229,6 -227,18 +229,22 @@@ msgstr " " -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" "Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Ange ett namn för denna skiva, såsom \"Debian 2.1r1 Disk 1\"" ++msgstr "" + + #: cmdline/apt-cdrom.cc:93 ++#, fuzzy + msgid "Please insert a Disc in the drive and press enter" -msgstr "Mata in skivan i enheten och tryck Enter" ++msgstr "" ++"Mediabyte: Sätt i disken med etiketten\n" ++" \"%s\"\n" ++"i enhet \"%s\" och tryck Enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Repetera denna process för resten av CD-skivorna i din uppsättning." ++msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "Flaggorna gavs inte parvis" @@@ -290,7 -300,7 +306,7 @@@ msgstr " " -c=? Läs denna inställningsfil.\n" " -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@@ -299,32 -309,31 +315,32 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan inte ta reda på debconfs version. Är debconf installerat?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Listan över filtillägg för Packages är för lång" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Fel vid behandling av katalogen %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "Listan över filtillägg för Sources är för lång" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "Fel vid skrivning av huvud till innehållsfil" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Fel vid behaldning av innehållet %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -366,7 -375,7 +382,7 @@@ " -o=? Set an arbitrary configuration option" msgstr "" "Användning: apt-ftparchive [flaggor] kommando\n" -"Kommandon: packages binärsökväg [åsidosättningsfil [sökvägsprefix]]\n" +"Kommandon: packages binärsökväg [åsidosättningsfill [sökvägsprefix]]\n" " sources källsökväg [åsidosättningsfil [sökvägsprefix]]\n" " contents sökväg\n" " release sökväg\n" @@@ -396,7 -405,7 +412,7 @@@ "\n" "Flaggor:\n" " -h Denna hjälptext\n" -" --md5 Kontrollera generering av MD5\n" +" --md5 Styr generering av MD5\n" " -s=? Källkods-override-fil\n" " -q Tyst\n" " -d=? Väljer den valfria cachedatabasen\n" @@@ -405,11 -414,11 +421,11 @@@ " -c=? Läs denna konfigurationsfil\n" " -o=? Ange valfri inställningsflagga" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "Inga val träffades" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Några filer saknas i paketfilsgruppen \"%s\"" @@@ -429,7 -438,7 +445,7 @@@ msgstr "DB är för gammal, försöker uppg msgid "Unable to open DB file %s: %s" msgstr "Kunde inte öppna DB-filen %s: %s" -# Felmeddelande för misslyckad chdir +# Felmeddelande för misslyckad chdir #: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" @@@ -443,86 -452,86 +459,86 @@@ msgstr "Arkivet har ingen styrpost msgid "Unable to get a cursor" msgstr "Kunde inte få tag i någon markör" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "V: Kunde inte läsa katalogen %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "V: Kunde inte ta status på %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "F: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "V: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "F: Felen gäller filen " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Misslyckades att slå upp %s" -# ??? +# ??? - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "Trävandring misslyckades" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "Misslyckades att öppna %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " Avlänka %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "Misslyckades att läsa länk %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "Misslyckades att länka ut %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Misslyckades att länka %s till %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Avlänkningsgräns på %sB nådd.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Misslyckades att ta status på %s" -# Fält vid namn "Package" +# Fält vid namn "Package" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" -# parametrar: paket, ny, gammal +# parametrar: paket, ny, gammal - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för %s är %s ej %s\n" @@@ -541,7 -550,7 +557,7 @@@ msgstr "realloc - Misslyckades att allo msgid "Unable to open %s" msgstr "Kunde inte öppna %s" -# parametrar: filnamn, radnummer +# parametrar: filnamn, radnummer #: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format msgid "Malformed override %s line %lu #1" @@@ -567,7 -576,7 +583,7 @@@ msgstr "Misslyckades att läsa override- msgid "Unknown compression algorithm '%s'" msgstr "Okänd komprimeringsalgoritm \"%s\"" -# ??? +# ??? #: ftparchive/multicompress.cc:105 #, c-format msgid "Compressed output %s needs a compression set" @@@ -624,236 -633,258 +640,258 @@@ msgstr "Problem med att länka ut %s msgid "Failed to rename %s to %s" msgstr "Misslyckades att byta namn på %s till %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "J" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid tolkning av reguljärt uttryck - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Följande paket har beroenden som inte kan tillfredsställas:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "men %s är installerat" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "men %s skall installeras" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "men det kan inte installeras" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "men det är ett virtuellt paket" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "men det är inte installerat" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " eller" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "Följande NYA paket kommer att installeras:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "Följande paket kommer att TAS BORT:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "Följande paket har hållits tillbaka:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "Följande paket kommer att uppgraderas:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Följande paket kommer att NEDGRADERAS:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Följande hållna paket kommer att ändras:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (på grund av %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "VARNING: Följande systemkritiska paket kommer att tas bort\n" -"Detta bör INTE göras såvida du inte vet exakt vad du gör!" +"Detta bör INTE göras såvida du inte vet precis vad du gör!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu uppgraderade, %lu nyinstallerade, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "%lu ominstallerade, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderade, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu ej uppgraderade.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ej helt installerade eller borttagna.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Rättar beroenden...." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " misslyckades." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Kunde inte rätta beroenden" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Kunde inte minimera uppgraderingsuppsättningen" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Färdig" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du kan möjligen rätta dessa genom att köra \"apt-get -f install\"." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsställda beroenden. Försök med -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VARNING: Följande paket kunde inte autentiseras!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "Authentiseringsvarning överkörd.\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "Installera dessa paket utan verifiering [j/N]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "Några av paketen kunde inte autentiseras" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppstått och -y användes utan --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Internt fel. InstallPackages kallades upp med brutna paket!" ++msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "Paket måste tas bort men \"Remove\" är inaktiverat." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Internt fel. Sorteringen färdigställdes inte" ++msgstr "Internt fel när en omdirigering skulle läggas till" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen." - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" -"Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian." -"org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Behöver hämta %sB/%sB arkiv.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Behöver hämta %sB arkiv.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter uppackning kommer %sB ytterligare diskutrymme användas.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigöras på disken.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "Kunde inte läsa av ledigt utrymme i %s" ++msgstr "Du har inte tillräckligt ledigt utrymme i %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har inte tillräckligt ledigt utrymme i %s" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Ja, gör som jag säger!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" "Du är på väg att göra något som kan vara skadligt\n" -"Skriv frasen '%s' för att fortsätta\n" +"Skriv frasen \"%s\" för att fortsätta\n" " ?] " -# Visas då man svarar nej -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 +# Visas då man svarar nej - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Avbryter." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades att hämta %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "Misslyckades att hämta vissa filer" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -861,48 -892,48 +899,48 @@@ msgstr " "Vissa arkiv kunte inte hämtas. Pröva eventuellt \"apt-get update\" eller med " "--fix-missing." - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stöds inte ännu" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Kunde inte rätta saknade paket." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Avbryter installationen." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Observera, väljer %s istället för %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paketet %s är inte installerat, så tas inte bort\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Installerat]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Du bör explicit ange ett att installera." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -913,49 -944,49 +951,49 @@@ msgstr " "Detta betyder vanligen att paketet saknas, har blivit föråldrat eller\n" "bara är tillgängligt från andra källor\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Dock kan följande paket ersätta det:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketet %s har ingen installationskandidat" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s är redan den senaste versionen.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" för \"%s\" hittades inte" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald version %s (%s) för %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Kunde inte låsa listkatalogen" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@@ -963,25 -994,25 +1001,44 @@@ msgstr " "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " "använts istället." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "Följande information kan vara till hjälp för att lösa situationen:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Internt fel, AllUpgrade förstörde något" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, väljer %s för regex \"%s\"\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan möjligen rätta detta genom att köra \"apt-get -f install\":" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -989,7 -1020,7 +1046,7 @@@ msgstr " "Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket " "(eller ange en lösning)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1001,7 -1032,7 +1058,7 @@@ msgstr " "distributionen, att några krävda paket ännu inte har skapats eller\n" "lagts in från \"Incoming\"." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1011,105 -1042,114 +1068,111 @@@ msgstr " "helt enkelt inte kan installeras och att en felrapport om detta bör\n" "skrivas." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "Följande information kan vara till hjälp för att lösa situationen:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Trasiga paket" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Föreslagna paket:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Rekommenderade paket:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Misslyckades" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Färdig" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "Internt fel, problemlösaren bröt sönder saker" ++msgstr "Internt fel, AllUpgrade förstörde något" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange åtminstone ett paket att hämta källkod för" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt ledigt utrymme i %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkod %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "Misslyckades att hämta vissa arkiv." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan redan uppackad källkod i %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Kontrollera om paketet 'dpkg-dev' är installerat.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "Barnprocessen misslyckades" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange åtminstone ett paket att inhämta byggberoenden för" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta byggberoendeinformation för %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1117,7 -1157,7 +1180,7 @@@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1126,32 -1166,32 +1189,32 @@@ msgstr " "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s uppfyller versionskraven" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s " "är för nytt" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades att uppfylla %s-beroendet för %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte uppfyllas." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Moduler som stöds:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1230,23 -1270,23 +1293,23 @@@ msgstr " "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" -# Måste vara tre bokstäver(?) -# "Hit" = aktuell version är fortfarande giltig +# Måste vara tre bokstäver(?) +# "Hit" = aktuell version är fortfarande giltig #: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "Bra " -# "Get:" = hämtar ny version +# "Get:" = hämtar ny version #: cmdline/acqprogress.cc:79 msgid "Get:" msgstr "Läs:" -# "Ign" = hoppar över +# "Ign" = hoppar över #: cmdline/acqprogress.cc:110 msgid "Ign " msgstr "Ign " -# "Err" = fel vid hämtning +# "Err" = fel vid hämtning #: cmdline/acqprogress.cc:114 msgid "Err " msgstr "Fel " @@@ -1309,9 -1349,9 +1372,9 @@@ msgstr "Ogiltig standardinställning! msgid "Press enter to continue." msgstr "Tryck Enter för att fortsätta." -# Note to translators: The following four messages belong together. It doesn't -# matter where sentences start, but it has to fit in just these four lines, and -# at only 80 characters per line, if possible. +# Note to translators: The following four messages belong together. It doesn't +# matter where sentences start, but it has to fit in just these four lines, and +# at only 80 characters per line, if possible. #: dselect/install:100 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Fel uppstod vid uppackning. Jag kommer ställa in de paket som" @@@ -1374,7 -1414,7 +1437,7 @@@ msgstr "Arkivet är för kort msgid "Failed to read the archive headers" msgstr "Misslyckades att läsa arkivhuvuden" -# noden har inte någon länk till nästa paket +# noden har inte någon länk till nästa paket #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" msgstr "DropNode anropat på olänkad nod" @@@ -1407,7 -1447,7 +1470,7 @@@ msgid "Duplicate conf file %s/%s msgstr "Duplicerad konfigurationsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format +#, fuzzy, c-format msgid "Failed to write file %s" msgstr "Misslyckades att skriva filen %s" @@@ -1453,7 -1493,7 +1516,7 @@@ msgstr "Misslyckades att hitta noden i msgid "The path is too long" msgstr "Sökvägen är för lång" -# ??? +# ??? #: apt-inst/extract.cc:417 #, c-format msgid "Overwrite package match with no version for %s" @@@ -1464,8 -1504,8 +1527,9 @@@ msgstr "Skriver över paketträff utan ve msgid "File %s/%s overwrites the one in the package %s" msgstr "Filen %s/%s skriver över den i paketet %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunde inte läsa %s" @@@ -1495,13 -1535,13 +1559,13 @@@ msgid "The info and temp directories ne msgstr "Katalogerna info och temp måste ligga på samma filsystem" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Läser paketlistor" -# Felmeddelande för misslyckad chdir +# Felmeddelande för misslyckad chdir #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" @@@ -1587,7 -1627,7 +1651,7 @@@ msgstr "Detta är inte ett giltigt DEB-a msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Detta är inte ett giltigt DEB-arkiv, både \"%s\" och \"%s\" saknas" -# chdir +# chdir #: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" @@@ -1605,12 -1645,12 +1669,12 @@@ msgstr "Misslyckades att hitta en gilti msgid "Unparsable control file" msgstr "Kunde inte tolka control-filen" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Kunde inte läsa cd-rom-databasen %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1618,28 -1658,33 +1682,34 @@@ msgstr " "Använd apt-cdrom för att APT ska känna igen denna cd. apt-get update kan " "inte användas för att lägga till skivor" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Fel cd" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Disk ej funnen." ++msgstr "Filen ej funnen" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Filen ej funnen" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kunde inte ta status" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Misslyckades sätta modifieringstid" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Ogiltig URI, lokala URI:er får inte starta med //" @@@ -1697,7 -1742,7 +1767,7 @@@ msgstr "Inget svar på förbindelsen ino msgid "Server closed the connection" msgstr "Servern stängde förbindelsen" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Läsfel" @@@ -1709,7 -1754,7 +1779,7 @@@ msgstr "Ett svar spillde bufferten. msgid "Protocol corruption" msgstr "Protokollet fördärvat" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivfel" @@@ -1781,7 -1826,7 +1851,7 @@@ msgstr "Datauttag (socket) fick inte sv msgid "Data transfer failed, server said '%s'" msgstr "Dataöverföring misslyckades, servern sade \"%s\"" -# Statusmeddelande, byter från substantiv till verb +# Statusmeddelande, byter från substantiv till verb #. Get the files information #: methods/ftp.cc:997 msgid "Query" @@@ -1791,7 -1836,7 +1861,7 @@@ msgstr "Frågar msgid "Unable to invoke " msgstr "Kunde inte starta " -# Felmeddelande för misslyckad chdir +# Felmeddelande för misslyckad chdir #: methods/connect.cc:64 #, c-format msgid "Connecting to %s (%s)" @@@ -1802,7 -1847,7 +1872,7 @@@ msgstr "Ansluter till %s (%s) msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -# [f]amilj, [t]yp, [p]rotokoll +# [f]amilj, [t]yp, [p]rotokoll #: methods/connect.cc:80 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" @@@ -1813,50 -1858,89 +1883,88 @@@ msgstr "Kunde inte skapa uttag (socket msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kunde inte påbörja anslutning till %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunde inte ansluta till %s:%s (%s), tog för lång tid" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunde inte ansluta till %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Kunde inte slå upp \"%s\"" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporärt fel vid uppslagning av \"%s\"" -# Okänd felkod; %i = koden +# Okänd felkod; %i = koden - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Något otäckt hände när \"%s:%s\" slogs upp (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kunde inte ansluta till %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Argumentslistan från Acquire::gpgv::Options för lång. Avslutar." ++msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Åtminstone en giltig signatur träffades på." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Kunde inte exekvera " ++msgstr "Kunde inte erhålla låset %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr " för att verifiera signature (är gnupg installerad?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Okänt fel vid exekvering av gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Följande signaturer är ogiltiga:\n" ++msgstr "Följande ytterligare paket kommer att installeras:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Följande signaturer kunde inte verifieras för att den publika nyckeln inte " -"är tillgänglig:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" msgstr "Kunde inte öppna rör för %s" -# %s = programnamn +# %s = programnamn #: methods/gzip.cc:102 #, c-format msgid "Read error from %s process" @@@ -1935,10 -2019,6 +2043,6 @@@ msgstr "Anslutning misslyckades msgid "Internal error" msgstr "Internt fel" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Förbindelsen stängdes i förtid" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Kan inte utföra mmap på en tom fil" @@@ -1953,57 -2033,57 +2057,57 @@@ msgstr "Kunde inte utföra mmap på %lu b msgid "Selection %s not found" msgstr "Valet %s ej funnet" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Okänd typförkortning: \"%c\"" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "Öppnar konfigurationsfil %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Rad %d för lång (max %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfel %s:%u: Block börjar utan namn." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfel %s:%u: Felformat märke" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras på toppnivån" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfel %s:%u: Inkluderad härifrån" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds ej" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut" @@@ -2069,8 -2149,8 +2173,8 @@@ msgstr "Felaktig operation %s msgid "Unable to stat the mount point %s" msgstr "Kunde inte ta status på monteringspunkt %s." -# Felmeddelande för misslyckad chdir +# Felmeddelande för misslyckad chdir - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kunde inte gå till %s" @@@ -2079,74 -2159,74 +2183,74 @@@ msgid "Failed to stat the cdrom" msgstr "Kunde inte ta status på cd-romen." - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Använder inte låsning för skrivskyddad låsfil %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "Kunde inte öppna låsfilen %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Använder inte låsning för nfs-monterad låsfil %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "Kunde inte erhålla låset %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade, på %s men den fanns inte där" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerade en felkod (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s avslutade oväntat" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "Kunde inte öppna filen %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "läsning, har fortfarande %lu att läsa men inget är kvar" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde ej" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "Problem med att stänga filens" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "Problem med att länka ut filen" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "Problem med att synka filen" -# Felmeddelande +# Felmeddelande #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" msgstr "Paketcachen är tom" @@@ -2184,7 -2264,7 +2288,7 @@@ msgstr "Föreslår msgid "Recommends" msgstr "Rekommenderar" -# "Konfliktar"? +# "Konfliktar"? #: apt-pkg/pkgcache.cc:219 msgid "Conflicts" msgstr "I konflikt med" @@@ -2193,7 -2273,7 +2297,7 @@@ msgid "Replaces" msgstr "Ersätter" -# "Föråldrar"? +# "Föråldrar"? #: apt-pkg/pkgcache.cc:220 msgid "Obsoletes" msgstr "Gör föråldrad" @@@ -2218,18 -2298,18 +2322,28 @@@ msgstr "valbart msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Bygger beroendeträd" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Kandiderande versioner" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Beroendegenerering" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Lägger in tillgänglighetsinformation" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Misslyckades att skriva filen %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2240,52 -2320,52 +2354,52 @@@ msgstr "Kunde inte tolka paketfilen %s msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i källistan %s har fel format (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i källistan %s har fel format (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Öppnar %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u för lång i källistan %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen \"%s\" är okänd på rad %u i källistan %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" @@@ -2307,14 -2387,14 +2421,14 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "Indexfiler av typ \"%s\" stöds inte" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2322,37 -2402,47 +2436,50 @@@ msgstr " "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " "hållna paket." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållt trasiga paket." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listkatalogen %spartial saknas." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial saknas." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Laddar ner fil %li av %li (%s återstår)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Metoddrivrutinen %s kunde inte hittas." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startade inte korrekt" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Mata in disken med etiketten '%s' i enheten '%s' och tryck Enter." ++msgstr "" ++"Mediabyte: Sätt i disken med etiketten\n" ++" \"%s\"\n" ++"i enhet \"%s\" och tryck Enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketsystemet \"%s\" stöds inte" -# -#: apt-pkg/init.cc:135 +# - #: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kunde inte avgöra en lämpligt paketsystemstyp" @@@ -2373,7 -2463,7 +2500,7 @@@ msgstr "Paketlistan eller statusfilen k msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan möjligen rätta problemet genom att köra \"apt-get update\"" -# "Package" är en sträng i inställningsfilen +# "Package" är en sträng i inställningsfilen #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" msgstr "Ogiltig post i inställningsfilen, \"Package\"-huvud saknas" @@@ -2387,84 -2477,84 +2514,84 @@@ msgstr "Förstod inte nåltypen %s msgid "No priority (or zero) specified for pin" msgstr "Prioritet ej angiven (eller noll) för nål" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Cachen har ett inkompatibelt versionssystem" -# NewPackage etc. är funktionsnamn -#: apt-pkg/pkgcachegen.cc:117 +# NewPackage etc. är funktionsnamn - #: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Fel uppstod vid hantering av %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fel uppstod vid hantering av %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fel uppstod vid hantering av %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fel uppstod vid hantering av %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fel uppstod vid hantering av %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fel uppstod vid hantering av %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Grattis, du överskred antalet paketnamn denna APT kan hantera." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Grattis, du överskred antalet versioner denna APT kan hantera." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Grattis, du överskred antalet beroenden denna APT kan hantera." -# NewPackage etc. är funktionsnamn -#: apt-pkg/pkgcachegen.cc:241 +# NewPackage etc. är funktionsnamn - #: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fel uppstod vid hantering av %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketet %s %s hittades inte när filberoenden hanterades" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status på källkodspaketlistan %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "Samlar filberoenden" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" @@@ -2473,11 -2563,11 +2600,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stämmer inte" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2486,7 -2576,7 +2613,7 @@@ msgstr " "Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2495,13 -2585,13 +2622,13 @@@ msgstr " "Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är trasiga. Inget \"Filename:\"-fält för paketet %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Storleken stämmer inte" @@@ -2510,7 -2600,7 +2637,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Leverantörsblock %s saknar fingeravtryck" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2519,47 -2609,47 +2646,47 @@@ msgstr " "Använder cd-rom-monteringspunkt %s\n" "Monterar cd-rom\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identifierar.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Etikett: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Använder cd-rom-monteringspunkt %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Avmonterar cd-rom\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Väntar på skiva...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Monterar cd-rom...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Söker efter indexfiler på disken...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Hittade %i paketindex, %i källkodsindex och %i signaturer\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Namnet är ogiltigt, försök igen.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2568,19 -2658,19 +2695,19 @@@ msgstr " "Denna skiva heter: \n" "\"%s\"\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kopierar paketlistor..." - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Skriver ny källista\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Poster i källistan för denna skiva:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Avmonterar cd-rom..." @@@ -2604,18 -2694,73 +2731,72 @@@ msgstr "Skrev %i poster med %i filer so msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Förbereder %s" ++msgstr "Öppnar %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Packar upp %s" ++msgstr "Öppnar %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Förbereder konfigurering av %s" ++msgstr "Öppnar konfigurationsfil %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Konfigurerar %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "Installerade %s" ++msgstr " Installerad: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Förbereder för borttagning av %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Tar bort %s" ++msgstr "Öppnar %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "Tog bort %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Förbereder för borttagning med konfiguration %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "Borttagen med konfiguration %s" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Förbindelsen stängdes i förtid" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "Okänt leverantörs-id \"%s\" pÃ¥ rad %u i källistan %s" +#~ msgstr "Okänt leverantörs-id \"%s\" på rad %u i källistan %s" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" #~ "You might want to run `apt-get -f install' to correct these." #~ msgstr "" -#~ "Trasiga paket hittades när byggberoenden behandlades. Du kan " -#~ "möjligen\n" -#~ "rätta detta genom att köra \"apt-get -f install\"." +#~ "Trasiga paket hittades när byggberoenden behandlades. Du kan möjligen\n" +#~ "rätta detta genom att köra \"apt-get -f install\"." #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" -#~ "Beklagar, men du har inte tillräckligt ledigt utrymme pÃ¥ %s för att " -#~ "lagra alla .deb-filerna." +#~ "Beklagar, men du har inte tillräckligt ledigt utrymme på %s för att lagra " +#~ "alla .deb-filerna." diff --combined po/tl.po index 9fc7a93ba,58c30347d..d00ba0fd9 --- a/po/tl.po +++ b/po/tl.po @@@ -1,17 -1,17 +1,17 @@@ # Tagalog messages for apt debconf. # Copyright (C) 2005 Software in the Public Interest, Inc. # This file is distributed under the same license as apt. -# Itong talaksan ay ipinapamahagi sa parehong lisensya ng apt. +# Itong tipunan ay ipinamamahagi sa parehong lisensya ng apt. # Eric Pareja , 2005 # This file is maintained by Eric Pareja -# Itong talaksan ay inaalagaan ni Eric Pareja +# Itong tipunan ay inaalagaan ni Eric Pareja # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-11-03 03:35+0800\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-02-09 16:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" "MIME-Version: 1.0\n" @@@ -22,18 -22,18 +22,18 @@@ #: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n" +msgstr "Paketeng %s bersyon %s ay may di ayos na dep:\n" #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" -msgstr "Hindi mahanap ang paketeng %s" +msgstr "Di mahanap ang paketeng %s" #: cmdline/apt-cache.cc:232 msgid "Total package names : " -msgstr "Kabuuan ng mga Pakete : " +msgstr "Kabuuang mga Pakete : " #: cmdline/apt-cache.cc:272 msgid " Normal packages: " @@@ -45,7 -45,7 +45,7 @@@ msgstr " Purong Birtwual na Pakete: #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr " Nag-iisang Birtwal na Pakete: " +msgstr " Mag-isang Birtwal na Pakete: " #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " @@@ -57,40 -57,40 +57,40 @@@ msgstr " Kulang/Nawawala: #: cmdline/apt-cache.cc:278 msgid "Total distinct versions: " -msgstr "Kabuuan ng Natatanging mga Bersyon: " +msgstr "Kabuuang Kakaibang Bersyon: " #: cmdline/apt-cache.cc:280 msgid "Total dependencies: " -msgstr "Kabuuan ng mga Dependensiya: " +msgstr "Kabuuang Dependensiya: " #: cmdline/apt-cache.cc:283 msgid "Total ver/file relations: " -msgstr "Kabuuan ng ugnayang Ber/Talaksan: " +msgstr "Kabuuang Ber/Tipunan relasyon: " #: cmdline/apt-cache.cc:285 msgid "Total Provides mappings: " -msgstr "Kabuuan ng Mapping ng Provides: " +msgstr "Kabuuang Mapping ng Provides: " #: cmdline/apt-cache.cc:297 msgid "Total globbed strings: " -msgstr "Kabuuan ng Globbed String: " +msgstr "Kabuuang Globbed String: " #: cmdline/apt-cache.cc:311 msgid "Total dependency version space: " -msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: " +msgstr "Kabuuang lugar ng Dependensiya Bersyon: " #: cmdline/apt-cache.cc:316 msgid "Total slack space: " -msgstr "Kabuuan ng Hindi Nagamit na puwang: " +msgstr "Kabuuang Maluwag na lugar: " #: cmdline/apt-cache.cc:324 msgid "Total space accounted for: " -msgstr "Kabuuan ng puwang na napag-tuosan: " +msgstr "Kabuuang lugar na napag-tuosan: " #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." -msgstr "Wala sa sync ang talaksan ng paketeng %s." +msgstr "Wala sa sync ang tipunang pakete %s." #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" @@@ -102,11 -102,11 +102,11 @@@ msgstr "Walang nahanap na mga pakete #: cmdline/apt-cache.cc:1462 msgid "Package files:" -msgstr "Talaksang Pakete:" +msgstr "Tipunang Pakete:" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete" +msgstr "Wala sa sync ang cache, hindi ma-x-ref ang tipunang pakete" #: cmdline/apt-cache.cc:1470 #, c-format @@@ -120,12 -120,12 +120,12 @@@ msgstr "Mga naka-Pin na Pakete: #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" -msgstr "(hindi nahanap)" +msgstr "(di nahanap)" #. Installed version #: cmdline/apt-cache.cc:1515 msgid " Installed: " -msgstr " Nakaluklok: " +msgstr " Naka-instol: " #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" @@@ -151,8 -151,8 +151,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" @@@ -196,22 -196,22 +196,22 @@@ msgid " "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Pag-gamit: apt-cache [mga option] utos\n" -" apt-cache [mga option] add talaksan1 [talaksan2 ...]\n" +" apt-cache [mga option] add tipunan1 [tipunan2 ...]\n" " apt-cache [mga option] showpkg pkt1 [pkt2 ...]\n" " apt-cache [mga option] showsrc pkt1 [pkt2 ...]\n" "\n" "apt-cache ay isang kagamitang low-level para sa pag-manipula\n" -"ng mga talaksan sa binary cache ng APT, at upang makakuha ng\n" +"ng mga tipunan sa binary cache ng APT, at upang makakuha ng\n" "impormasyon mula sa kanila\n" "\n" "Mga utos:\n" -" add - Magdagdag ng talaksang pakete sa source cache\n" +" add - Magdagdag ng tipunang pakete sa source cache\n" " gencaches - Buuin pareho ang cache ng pakete at source\n" " showpkg - Ipakita ang impormasyon tungkol sa isang pakete\n" " showsrc - Ipakita ang mga record ng source\n" " stats - Ipakita ang ilang mga estadistika\n" -" dump - Ipakita ang buong talaksan sa anyong maikli\n" -" dumpavail - Ipakita ang talaksang available sa stdout\n" +" dump - Ipakita ang buong tipunan sa anyong maikli\n" +" dumpavail - Ipakita ang tipunang available sa stdout\n" " unmet - Ipakita ang mga kulang na mga dependensiya\n" " search - Maghanap sa listahan ng mga pakete ng regex pattern\n" " show - Ipakita ang nababasang record ng pakete\n" @@@ -227,16 -227,28 +227,32 @@@ " -h Itong tulong na ito.\n" " -p=? Ang cache ng mga pakete.\n" " -s=? Ang cache ng mga source.\n" -" -q Huwag ipakita ang hudyat ng progreso.\n" +" -q Huwag ipakita ang indikator ng progreso.\n" " -i Ipakita lamang ang importanteng mga dep para sa utos na unmet\n" -" -c=? Basahin ang talaksang pagkaayos na ito\n" +" -c=? Basahin ang tipunang pagkaayos na ito\n" " -o=? Magtakda ng isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" "Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n" "karagdagang impormasyon\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'" ++msgstr "" + + #: cmdline/apt-cdrom.cc:93 ++#, fuzzy + msgid "Please insert a Disc in the drive and press enter" -msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter" ++msgstr "" ++"Pagpalit ng Media: Ikasa ang disk na may pangalang\n" ++" '%s'\n" ++"sa drive '%s' at pindutin ang enter\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set." ++msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Mga argumento ay hindi naka-pares" +msgstr "Mga argumento ay hindi nakapares" #: cmdline/apt-config.cc:76 msgid "" @@@ -255,7 -267,7 +271,7 @@@ msgstr "" "Pag-gamit: apt-config [mga option] utos\n" "\n" -"Ang apt-config ay simpleng kagamitan sa pagbasa ng talaksang pagkaayos\n" +"Ang apt-config ay simpleng kagamitan sa pagbasa ng tipunang pagkaayos\n" "ng APT\n" "\n" "Mga utos:\n" @@@ -263,13 -275,13 +279,13 @@@ " dump - ipakita ang pagkaayos\n" "Mga option:\n" " -h Itong tulong na ito.\n" -" -c=? Basahin itong talaksang pagkaayos\n" +" -c=? Basahin itong tipunang pagkaayos\n" " -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s ay hindi balido na paketeng DEB." +msgstr "%s ay di tanggap na paketeng DEB." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@@ -284,52 -296,51 +300,52 @@@ " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n" +"Pag-gamit: apt-extracttemplates tipunan1 [tipunan2 ...]\n" "\n" "Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n" "sa pagkaayos at template mula sa mga paketeng debian\n" "\n" -"Mga opsyon:\n" +"Mga option:\n" " -h Itong tulong na ito\n" " -t Itakda ang dir na pansamantala\n" -" -c=? Basahin ang talaksang pagkaayos na ito\n" +" -c=? Basahin ang tipunang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "Hindi makasulat sa %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?" +msgstr "Hindi makuha ang bersyon ng debconf. Naka-instol ba ang debconf?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" -msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete" +msgstr "Mahaba masyado ang talaang extensyon ng mga pakete" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Error sa pagproseso ng directory %s" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" -msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)" +msgstr "Mahaba masyado ang talaang extensyon ng pagkukunan (source)" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)" +msgstr "Error sa pagsulat ng header sa tipunang nilalaman (contents)" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "Error sa pagproseso ng Contents %s" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -378,24 -389,27 +394,24 @@@ msgstr " " generate config [mga grupo]\n" " clean config\n" "\n" -"Ang apt-ftparchive ay gumagawa ng talaksang index para sa arkibong Debian.\n" +"Ang apt-ftparchive ay gumagawa ng tipunang index para sa arkibong Debian.\n" "Suportado nito ang maraming estilo ng pagbuo mula sa awtomatikong buo\n" "at kapalit ng dpkg-scanpackages at dpkg-scansources\n" "\n" -"Bumubuo ang apt-ftparchive ng mga talaksang Package mula sa puno ng mga\n" -".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control " -"field\n" -"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. " -"Suportado\n" -"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at " +"Bumubuo ang apt-ftparchive ng mga tipunang Package mula sa puno ng mga\n" +".deb. Ang tipunang Package ay naglalaman ng laman ng lahat ng control field\n" +"mula sa bawat pakete pati na rin ang MD5 hash at laki ng tipunan. Suportado\n" +"ang pag-gamit ng tipunang override upang pilitin ang halaga ng Priority at " "Section.\n" "\n" -"Bumubuo din ang apt-ftparchive ng talaksang Sources mula sa puno ng mga\n" +"Bumubuo din ang apt-ftparchive ng tipunang Sources mula sa puno ng mga\n" ".dsc. Ang option na --source-override ay maaaring gamitin upang itakda\n" -"ang talaksang override ng src\n" +"ang tipunang override ng src\n" "\n" "Ang mga utos na 'packages' at 'sources' ay dapat patakbuhin sa ugat ng\n" "puno. Kailangan nakaturo ang BinaryPath sa ugat ng paghahanap na recursive\n" -"at ang talaksang override ay dapat naglalaman ng mga flag na override. Ang\n" -"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung " -"mayroon.\n" +"at ang tipunang override ay dapat naglalaman ng mga flag na override. Ang\n" +"pathprefix ay dinudugtong sa harap ng mga pangalan ng tipunan kung mayroon.\n" "Halimbawa ng pag-gamit mula sa arkibong Debian:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@@ -403,128 -417,128 +419,128 @@@ "Mga option:\n" " -h Itong tulong na ito\n" " --md5 Pagbuo ng MD5\n" -" -s=? Talaksang override ng source\n" +" -s=? Tipunang override ng source\n" " -q Tahimik\n" " -d=? Piliin ang optional caching database\n" " --no-delink Enable delinking debug mode\n" -" --contents Pagbuo ng talaksang contents\n" -" -c=? Basahin itong talaksang pagkaayos\n" +" --contents Pagbuo ng tipunang contents\n" +" -c=? Basahin itong tipunang pagkaayos\n" " -o=? Itakda ang isang option na pagkaayos" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" -msgstr "Walang mga pinili na tugma" +msgstr "Walang mga piniling nag-match" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'" +msgstr "May mga tipunang kulang sa grupong tipunang pakete `%s'" #: ftparchive/cachedb.cc:45 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old" +msgstr "Nasira ang DB, pinalitan ng pangalan ang tipunan sa %s.old" #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "Luma ang DB, sinusubukang maupgrade %s" +msgstr "Luma ang DB, sinusubukang i-apgreyd %s" #: ftparchive/cachedb.cc:73 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Hindi mabuksan ang talaksang DB %s: %s" +msgstr "Hindi mabuksan ang tipunang DB %s: %s" #: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" -msgstr "Nagbago ang petsa ng talaksan %s" +msgstr "Nagbago ang petsa ng tipunan %s" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" -msgstr "Walang kontrol rekord ang arkibo" +msgstr "Walang control record ang arkibo" #: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" msgstr "Hindi makakuha ng cursor" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Hindi mabasa ang directory %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Hindi ma-stat %s\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "E: " - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "W: " - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " -msgstr "E: Mga error ay tumutukoy sa talaksang " +msgstr "E: Mga error ay tumutukoy sa tipunang " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" -msgstr "Bigo sa pag-resolba ng %s" +msgstr "Sawi sa pag-resolba %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" -msgstr "Bigo ang paglakad sa puno" +msgstr "Sawi ang paglakad sa puno" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" -msgstr "Bigo ang pagbukas ng %s" +msgstr "Sawi ang pagbukas ng %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" -msgstr "Bigo ang pagbasa ng link %s" +msgstr "Sawi ang pagbasa ng link %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" -msgstr "Bigo ang pag-unlink ng %s" +msgstr "Sawi ang pag-unlink ng %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Bigo ang pag-link ng %s sa %s" +msgstr "*** Sawi ang pag-link ng %s sa %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" -msgstr "Bigo ang pag-stat ng %s" +msgstr "Sawi ang pag-stat ng %s" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Maintainer ng %s ay %s hindi %s\n" @@@ -536,7 -550,7 +552,7 @@@ msgstr "Internal error, hindi mahanap a #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Bigo ang pagreserba ng memory" +msgstr "realloc - Sawi ang pagreserba ng memory" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format @@@ -561,12 -575,12 +577,12 @@@ msgstr "Maling anyo ng override %s liny #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" -msgstr "Bigo ang pagbasa ng talaksang override %s" +msgstr "Sawi ang pagbasa ng tipunang override %s" #: ftparchive/multicompress.cc:75 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Hindi kilalang algorithmong compression '%s'" +msgstr "Di kilalang algorithmong compression '%s'" #: ftparchive/multicompress.cc:105 #, c-format @@@ -575,15 -589,15 +591,15 @@@ msgstr "Kailangan ng compression set an #: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" +msgstr "Sawi sa paglikha ng IPC pipe sa subprocess" #: ftparchive/multicompress.cc:198 msgid "Failed to create FILE*" -msgstr "Bigo ang paglikha ng FILE*" +msgstr "Sawi ang paglikha ng FILE*" #: ftparchive/multicompress.cc:201 msgid "Failed to fork" -msgstr "Bigo ang pag-fork" +msgstr "Sawi ang pag-fork" #: ftparchive/multicompress.cc:215 msgid "Compress child" @@@ -592,15 -606,15 +608,15 @@@ msgstr "Anak para sa pag-Compress #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "Error na internal, bigo ang paglikha ng %s" +msgstr "Error na Internal, Sawi ang paglikha ng %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "Bigo ang paglikha ng subprocess IPC" +msgstr "Sawi ang paglikha ng subprocess IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Bigo ang pag-exec ng taga-compress" +msgstr "Sawi ang pag-exec ng taga-compress" #: ftparchive/multicompress.cc:363 msgid "decompressor" @@@ -608,11 -622,11 +624,11 @@@ msgstr "taga-decompress #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "Bigo ang IO sa subprocess/talaksan" +msgstr "Sawi ang IO sa subprocess/tipunan" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "Bigo ang pagbasa habang tinutuos ang MD5" +msgstr "Sawi ang pagbasa habang tinutuos ang MD5" #: ftparchive/multicompress.cc:475 #, c-format @@@ -622,208 -636,232 +638,230 @@@ msgstr "Problema sa pag-unlink ng %s #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Bigo ang pagpangalan muli ng %s tungong %s" +msgstr "Sawi ang pagpangalan muli ng %s tungong %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "O" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" -msgstr "ngunit ang %s ay nakaluklok" +msgstr "ngunit %s ay naka-instol" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" -msgstr "ngunit ang %s ay iluluklok" +msgstr "ngunit %s ay iinstolahin" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" -msgstr "ngunit hindi ito maaaring iluklok" +msgstr "ngunit hindi ito maaaring instolahin" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" -msgstr "ngunit ito ay hindi nakaluklok" +msgstr "ngunit ito ay hindi naka-instol" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" -msgstr "ngunit ito ay hindi iluluklok" +msgstr "ngunit ito ay hindi iinstolahin" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " o" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" -msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" +msgstr "Ang sumusunod na BAGONG mga pakete ay iinstolahin:" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" -msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" +msgstr "Ang susunod na mga pakete ay TATANGGALIN:" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" -msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" +msgstr "Ang susunod na mga pakete ay hinayaang maiwanan:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" -msgstr "Ang susunod na mga pakete ay iu-upgrade:" +msgstr "Ang susunod na mga pakete ay ia-apgreyd:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" +"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu nai-upgrade, %lu bagong luklok, " +msgstr "%lu nai-upgrade, %lu bagong instol, " --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " -msgstr "%lu iniluklok muli, " +msgstr "%lu ininstol muli, " --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" +msgstr "%lu na tatanggalin at %lu na di inapgreyd.\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" +msgstr "%lu na di lubos na na-instol o tinanggal.\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "Inaayos ang mga dependensiya..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." -msgstr " ay bigo." +msgstr " ay sawi." --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "Hindi maayos ang mga dependensiya" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "Hindi mai-minimize ang upgrade set" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " Tapos" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito." --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" -"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " -msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? " +msgstr "Instolahin ang mga paketeng ito na walang beripikasyon [o/H]? " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" -"Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" ++msgstr "Internal error sa pagdagdag ng diversion" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" -msgstr "Hindi maaldaba ang directory ng download" +msgstr "Di maaldaba ang directory ng download" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" -"Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian." -"org" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibo.\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Matapos magbuklat ay %sB na karagdagang puwang sa disk ay magagamit.\n" +msgstr "Matapos magbuklat ay %sB ng karagdagang lugar sa disk ay magagamit.\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Matapos magbuklat %sB na puwang sa disk ay mapapalaya.\n" +msgstr "Matapos magbuklat %sB ng lugar sa disk ay mapapalaya.\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "Hindi matantsa ang libreng puwang sa %s" ++msgstr "Kulang kayo ng libreng puwang sa %s" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." -msgstr "Kulang kayo ng libreng puwang sa %s." +msgstr "Kulang kayo ng libreng lugar sa %s." - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@@ -833,28 -871,28 +871,28 @@@ msgstr " "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "Abort." - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Bigo sa pagkuha ng %s %s\n" +msgstr "Sawi sa pagkuha ng %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" -msgstr "May mga talaksang hindi nakuha" +msgstr "May mga tipunang hindi nakuha" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" -msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" +msgstr "Kumpleto ang pagkakuha ng mga tipunan sa modong pagkuha lamang" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -862,48 -900,48 +900,48 @@@ msgstr " "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Paunawa, pinili ang %s imbes na %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Linaktawan ang %s, ito'y naka-instol na at hindi nakatakda ang upgrade.\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Hindi naka-instol ang paketeng %s, kaya't hindi ito tinanggal\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [Naka-instol]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "Dapat ninyong piliin ang isa na instolahin." - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -914,76 -952,76 +952,96 @@@ msgstr " "Maaaring nawawala ang pakete, o ito'y laos na, o ito'y makukuha lamang\n" "sa ibang pinagmulan.\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ang pag-instol muli ng %s ay hindi maaari, hindi ito makuha.\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " +"May mga tipunang index na hindi nakuha, sila'y di pinansin, o ginamit ang " "mga luma na lamang." - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "" ++"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -991,7 -1029,7 +1049,7 @@@ msgstr " "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -1002,7 -1040,7 +1060,7 @@@ msgstr " "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -1012,106 -1050,115 +1070,111 @@@ msgstr " "hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "" --"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "Sirang mga pakete" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "Kinakalkula ang upgrade... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" -msgstr "Bigo" +msgstr "Sawi" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "Tapos" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "Error na internal, may nasira ang problem resolver" ++msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." -msgstr "Bigo sa pagkuha ng ilang mga arkibo." +msgstr "Sawi sa pagkuha ng ilang mga arkibo." - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Bigo ang utos ng pagbuklat '%s'.\n" +msgstr "Sawi ang utos ng pagbuklat '%s'.\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Utos na build '%s' ay bigo.\n" +msgstr "Utos na build '%s' ay sawi.\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" -msgstr "Bigo ang prosesong anak" +msgstr "Sawi ang prosesong anak" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1120,7 -1167,7 +1183,7 @@@ msgstr " "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1129,32 -1176,32 +1192,32 @@@ msgstr " "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" +"Sawi sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" +msgstr "Sawi sa pagbuo ng dependensiyang %s para sa %s: %s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" -msgstr "Bigo sa pagproseso ng build dependencies" +msgstr "Sawi sa pagproseso ng build dependencies" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "Suportadong mga Module:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1212,8 -1259,8 +1275,8 @@@ msgstr " " build-dep - Magsaayos ng build-dependencies para sa mga paketeng source\n" " dist-upgrade - Mag-upgrade ng pamudmod, basahin ang apt-get(8)\n" " dselect-upgrade - Sundan ang mga pinili sa dselect\n" -" clean - Burahin ang mga nakuhang mga talaksang naka-arkibo\n" -" autoclean - Burahin ang mga lumang naka-arkibo na nakuhang mga talaksan\n" +" clean - Burahin ang mga nakuhang mga tipunang naka-arkibo\n" +" autoclean - Burahin ang mga lumang naka-arkibo na nakuhang mga tipunan\n" " check - Tiyakin na walang mga sirang dependensiya\n" "\n" "Mga option:\n" @@@ -1223,12 -1270,12 +1286,12 @@@ " -d Kunin lamang - HINDI mag-instol o mag-buklat ng mga arkibo\n" " -s Walang gagawin. Mag-simulate lamang ang pagkasunod-sunod.\n" " -y Assume Yes to all queries and do not prompt\n" -" -f Subukang magpatuloy kung bigo ang pagsuri ng integridad\n" +" -f Subukang magpatuloy kung sawi ang pagsuri ng integridad\n" " -m Subukang magpatuloy kung hindi mahanap ang mga arkibo\n" " -u Ipakita rin ang listahan ng mga paketeng i-upgrade\n" " -b Ibuo ang paketeng source matapos kunin ito\n" " -V Ipakita ng buo ang bilang ng bersyon\n" -" -c=? Basahin itong talaksang pagkaayos\n" +" -c=? Basahin itong tipunang pagkaayos\n" " -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" "Basahin ang pahinang manwal ng apt-get(8), sources.list(5) at apt.conf(5)\n" "para sa karagdagang impormasyon at mga option.\n" @@@ -1288,16 -1335,16 +1351,16 @@@ msgid " " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n" +"Pag-gamit: apt-sortpkgs [mga option] tipunan1 [tipunan2 ...]\n" "\n" -"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang " +"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng tipunang " "pakete.\n" -"Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan ito.\n" +"Ang option -s ay ginagamit upang ipaalam kung anong klaseng tipunan ito.\n" "\n" "Mga option:\n" " -h Itong tulong na ito\n" -" -s Gamitin ang pag-sort ng talaksang source\n" -" -c=? Basahin ang talaksang pagkaayos na ito\n" +" -s Gamitin ang pag-sort ng tipunang source\n" +" -c=? Basahin ang tipunang pagkaayos na ito\n" " -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" #: dselect/install:32 @@@ -1335,11 -1382,11 +1398,11 @@@ msgstr "Pinagsasama ang magagamit na im #: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" -msgstr "Bigo sa paglikha ng mga pipe" +msgstr "Sawi sa paglikha ng mga pipe" #: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " -msgstr "Bigo sa pagtakbo ng gzip " +msgstr "Sawi sa pagtakbo ng gzip " #: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" @@@ -1347,7 -1394,7 +1410,7 @@@ msgstr "Sirang arkibo #: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" -msgstr "Bigo ang checksum ng tar, sira ang arkibo" +msgstr "Sawi ang checksum ng tar, sira ang arkibo" #: apt-inst/contrib/extracttar.cc:298 #, c-format @@@ -1372,7 -1419,7 +1435,7 @@@ msgstr "Bitin ang arkibo. Sobrang iksi. #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Bigo ang pagbasa ng header ng arkibo" +msgstr "Sawi ang pagbasa ng header ng arkibo" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" @@@ -1380,11 -1427,11 +1443,11 @@@ msgstr "Tinawagan ang DropNode sa naka- #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "Bigo sa paghanap ng elemento ng hash!" +msgstr "Sawi sa paghanap ng elemento ng hash!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "Bigo ang pagreserba ng diversion" +msgstr "Sawi ang pagreserba ng diversion" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" @@@ -1403,17 -1450,17 +1466,17 @@@ msgstr "Dobleng pagdagdag ng diversion #: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "Nadobleng talaksang conf %s/%s" +msgstr "Nadobleng tipunang conf %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format +#, fuzzy, c-format msgid "Failed to write file %s" -msgstr "Bigo sa pagsulat ng talaksang %s" +msgstr "Sawi sa pagsulat ng tipunang %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format msgid "Failed to close file %s" -msgstr "Bigo sa pagsara ng talaksang %s" +msgstr "Sawi sa pagsara ng tipunang %s" #: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format @@@ -1446,7 -1493,7 +1509,7 @@@ msgstr "Ang directory %s ay papalitan n #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "Bigo ang paghanap ng node sa kanyang hash bucket" +msgstr "Sawi ang paghanap ng node sa kanyang hash bucket" #: apt-inst/extract.cc:287 msgid "The path is too long" @@@ -1460,10 -1507,10 +1523,11 @@@ msgstr "Patungan ng paketeng nag-match #: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" +msgstr "Ang tipunang %s/%s ay pumapatong sa isang tipunan sa paketeng %s" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" @@@ -1476,7 -1523,7 +1540,7 @@@ msgstr "Hindi ma-stat ang %s #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" -msgstr "Bigo sa pagtanggal ng %s" +msgstr "Sawi sa pagtanggal ng %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format @@@ -1486,23 -1533,23 +1550,23 @@@ msgstr "Hindi malikha ang %s #: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" -msgstr "Bigo sa pag-stat ng %sinfo" +msgstr "Sawi sa pag-stat ng %sinfo" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "Binabasa ang Listahan ng mga Pakete" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Bigo sa paglipat sa admin dir %sinfo" +msgstr "Sawi sa paglipat sa admin dir %sinfo" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 @@@ -1511,7 -1558,7 +1575,7 @@@ msgstr "Internal error sa pagkuha ng pa #: apt-inst/deb/dpkgdb.cc:205 msgid "Reading file listing" -msgstr "Binabasa ang Talaksang Listahan" +msgstr "Binabasa ang Tipunang Listahan" #: apt-inst/deb/dpkgdb.cc:216 #, c-format @@@ -1520,14 -1567,14 +1584,14 @@@ msgid " "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Bigo sa pagbukas ng talaksang listahan '%sinfo/%s'. Kung hindi niyo maibalik " -"ang talaksang ito, gawin itong walang laman at muling instolahin kaagad ang " +"Sawi sa pagbukas ng tipunang listahan '%sinfo/%s'. Kung hindi niyo maibalik " +"ang tipunang ito, gawin itong walang laman at muling instolahin kaagad ang " "parehong bersyon ng pakete!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Bigo sa pagbasa ng talaksang listahan %sinfo/%s" +msgstr "Sawi sa pagbasa ng tipunang listahan %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" @@@ -1536,17 -1583,17 +1600,17 @@@ msgstr "Internal error sa pagkuha ng No #: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Bigo sa pagbukas ng talaksang diversions %sdiversions" +msgstr "Sawi sa pagbukas ng tipunang diversions %sdiversions" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" -msgstr "Ang talaksang diversion ay sira" +msgstr "Ang tipunang diversion ay sira" #: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 #: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "Di tanggap na linya sa talaksang diversion: %s" +msgstr "Di tanggap na linya sa tipunang diversion: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" @@@ -1558,17 -1605,17 +1622,17 @@@ msgstr "Ang cache ng pkg ay dapat ma-in #: apt-inst/deb/dpkgdb.cc:386 msgid "Reading file list" -msgstr "Binabasa ang Talaksang Listahan" +msgstr "Binabasa ang Tipunang Listahan" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Bigo sa paghanap ng Pakete: Header, offset %lu" +msgstr "Sawi sa paghanap ng Pakete: Header, offset %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Maling ConfFile section sa talaksang status. Offset %lu" +msgstr "Maling ConfFile section sa tipunang status. Offset %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format @@@ -1597,18 -1644,18 +1661,18 @@@ msgstr "Internal error, hindi mahanap a #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "Bigo sa paghanap ng tanggap na talaksang control" +msgstr "Sawi sa paghanap ng tanggap na tipunang control" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "Di maintindihang talaksang control" +msgstr "Di maintindihang tipunang control" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Hindi mabasa ang database ng cdrom %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1616,28 -1663,33 +1680,34 @@@ msgstr " "Paki-gamit ang apt-cdrom upang makilala ng APT itong CD na ito. Hindi " "maaaring gamitin ang apt-get update upang magdagdag ng bagong mga CD" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Maling CD" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito." - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "Hindi nahanap ang Disk." ++msgstr "Hindi Nahanap ang Tipunan" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Hindi Nahanap ang Talaksan" +msgstr "Hindi Nahanap ang Tipunan" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" -msgstr "Bigo ang pag-stat" +msgstr "Sawi ang pag-stat" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Bigo ang pagtakda ng oras ng pagbago" +msgstr "Sawi ang pagtakda ng oras ng pagbago" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "Di tanggap na URI, mga lokal na URI ay di dapat mag-umpisa ng //" @@@ -1662,12 -1714,12 +1732,12 @@@ msgstr "Inayawan ng server ang ating ko #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "Bigo ang USER/GUMAGAMIT, sabi ng server ay: %s" +msgstr "Sawi ang USER/GUMAGAMIT, sabi ng server ay: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "Bigo ang PASS, sabi ng server ay: %s" +msgstr "Sawi ang PASS, sabi ng server ay: %s" #: methods/ftp.cc:237 msgid "" @@@ -1680,12 -1732,12 +1750,12 @@@ msgstr " #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s" +msgstr "Sawi ang utos sa login script '%s', sabi ng server ay: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "Bigo ang TYPE, sabi ng server ay: %s" +msgstr "Sawi ang TYPE, sabi ng server ay: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" @@@ -1695,7 -1747,7 +1765,7 @@@ msgstr "Lumipas ang koneksyon msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Error sa pagbasa" @@@ -1707,7 -1759,7 +1777,7 @@@ msgstr "May sagot na bumubo sa buffer. msgid "Protocol corruption" msgstr "Sira ang protocol" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Error sa pagsulat" @@@ -1751,7 -1803,7 +1821,7 @@@ msgstr "Di kilalang pamilya ng address #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "Bigo ang EPRT, sabi ng server ay: %s" +msgstr "Sawi ang EPRT, sabi ng server ay: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" @@@ -1763,12 -1815,12 +1833,12 @@@ msgstr "Hindi makatanggap ng koneksyon #: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Problema sa pag-hash ng talaksan" +msgstr "Problema sa pag-hash ng tipunan" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'" +msgstr "Hindi makakuha ng tipunan, sabi ng server ay '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@@ -1777,7 -1829,7 +1847,7 @@@ msgstr "Nag-timeout ang socket ng datos #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'" +msgstr "Sawi ang paglipat ng datos, sabi ng server ay '%s'" #. Get the files information #: methods/ftp.cc:997 @@@ -1808,43 -1860,85 +1878,81 @@@ msgstr "Hindi makalikha ng socket para msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)." - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Hindi maka-konek sa %s:%s (%s), nag-timeout ang koneksyon" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Hindi maka-konek sa %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kumokonek sa %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "Hindi maresolba ang '%s'" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'" +msgstr "Pansamantalang kasawian sa pagresolba ng '%s'" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "Hindi maka-konek sa %s %s:" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" -"E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. " -"Lalabas." + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" -"Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " -"fingerprint?!" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "Hindi ma-execute ang " ++msgstr "hindi makuha ang aldaba %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr " upang maberipika ang lagda (nakaluklok ba ang gnupg?)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "Hindi kilalang error sa pag-execute ng gpgv" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "Ang sumusunod na mga lagda ay imbalido:\n" ++msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" -"Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi " -"available:\n" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1890,7 -1984,7 +1998,7 @@@ msgstr "Di kilalang anyo ng petsa #: methods/http.cc:741 msgid "Select failed" -msgstr "Bigo ang pagpili" +msgstr "Sawi ang pagpili" #: methods/http.cc:746 msgid "Connection timed out" @@@ -1898,15 -1992,15 +2006,15 @@@ msgstr "Nag-timeout ang koneksyon #: methods/http.cc:769 msgid "Error writing to output file" -msgstr "Error sa pagsulat ng talaksang output" +msgstr "Error sa pagsulat ng tipunang output" #: methods/http.cc:797 msgid "Error writing to file" -msgstr "Error sa pagsulat sa talaksan" +msgstr "Error sa pagsulat sa tipunan" #: methods/http.cc:822 msgid "Error writing to the file" -msgstr "Error sa pagsusulat sa talaksan" +msgstr "Error sa pagsusulat sa tipunan" #: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" @@@ -1922,19 -2016,15 +2030,15 @@@ msgstr "Maling datos sa header #: methods/http.cc:1086 msgid "Connection failed" -msgstr "Bigo ang koneksyon" +msgstr "Sawi ang koneksyon" #: methods/http.cc:1177 msgid "Internal error" msgstr "Internal na error" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "Nagsara ng maaga ang koneksyon" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" -msgstr "Hindi mai-mmap ang talaksang walang laman" +msgstr "Hindi mai-mmap ang tipunang walang laman" #: apt-pkg/contrib/mmap.cc:87 #, c-format @@@ -1946,61 -2036,61 +2050,61 @@@ msgstr "Hindi makagawa ng mmap ng %lu n msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Hindi kilalang katagang uri: '%c'" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" -msgstr "Binubuksan ang talaksang pagsasaayos %s" +msgstr "Binubuksan ang tipunang pagsasaayos %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "Labis ang haba ng linyang %d (max %d)" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan." - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Maling anyo ng Tag" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: May basura matapos ng halaga" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Sinama mula dito" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan" +msgstr "Syntax error %s:%u: May basura sa dulo ng tipunan" #: apt-pkg/contrib/progress.cc:154 #, c-format @@@ -2065,83 -2155,84 +2169,83 @@@ msgstr "Di tanggap na operasyon %s msgid "Unable to stat the mount point %s" msgstr "Di mai-stat ang mount point %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Di makalipat sa %s" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" -msgstr "Bigo sa pag-stat ng cdrom" +msgstr "Sawi sa pag-stat ng cdrom" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -"Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" +"Hindi ginagamit ang pagaldaba para sa basa-lamang na tipunang aldaba %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" -msgstr "Hindi mabuksan ang talaksang aldaba %s" +msgstr "Hindi mabuksan ang tipunang aldaba %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -"Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " -"nfs" +"Hindi gumagamit ng pag-aldaba para sa tipunang aldaba %s na naka-mount sa nfs" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Naghudyat ang sub-process %s ng error code (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" -msgstr "Hindi mabuksan ang talaksang %s" +msgstr "Hindi mabuksan ang tipunang %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" -msgstr "Problema sa pagsara ng talaksan" +msgstr "Problema sa pagsara ng tipunan" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" -msgstr "Problema sa pag-unlink ng talaksan" +msgstr "Problema sa pag-unlink ng tipunan" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" -msgstr "Problema sa pag-sync ng talaksan" +msgstr "Problema sa pag-sync ng tipunan" #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" @@@ -2149,11 -2240,11 +2253,11 @@@ msgstr "Walang laman ang cache ng paket #: apt-pkg/pkgcache.cc:132 msgid "The package cache file is corrupted" -msgstr "Sira ang talaksan ng cache ng pakete" +msgstr "Sira ang tipunan ng cache ng pakete" #: apt-pkg/pkgcache.cc:137 msgid "The package cache file is an incompatible version" -msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon" +msgstr "Ang tipunan ng cache ng pakete ay hindi magamit na bersyon" #: apt-pkg/pkgcache.cc:142 #, c-format @@@ -2212,77 -2303,77 +2316,87 @@@ msgstr "optional msgid "extra" msgstr "extra" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "Ginagawa ang puno ng mga dependensiya" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "Bersyong Kandidato" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "Pagbuo ng Dependensiya" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "Pinagsasama ang magagamit na impormasyon" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "Sawi sa pagsulat ng tipunang %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Hindi ma-parse ang talaksang pakete %s (1)" +msgstr "Hindi ma-parse ang tipunang pakete %s (1)" #: apt-pkg/tagfile.cc:160 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Hindi ma-parse ang talaksang pakete %s (2)" +msgstr "Hindi ma-parse ang tipunang pakete %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." -msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." +msgstr "Labis ang haba ng linyang %u sa tipunang pagkukunan %s." --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" +msgstr "Maling anyo ng linyang %u sa tipunang pagkukunan %s (uri)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Di kilalang uri '%s' sa linyang %u sa talaksang pagkukunan %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" +msgstr "Di kilalang uri '%s' sa linyang %u sa tipunang pagkukunan %s" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)" +msgstr "Maling anyo ng linyang %u sa tipunang pagkukunan %s (vendor id)" #: apt-pkg/packagemanager.cc:402 #, c-format @@@ -2299,9 -2390,9 +2413,9 @@@ msgstr " #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Hindi suportado ang uri ng talaksang index na '%s'" +msgstr "Hindi suportado ang uri ng tipunang index na '%s'" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@@ -2309,7 -2400,7 +2423,7 @@@ msgstr " "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " "para dito." --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2317,37 -2408,48 +2431,50 @@@ msgstr " "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " "ito ng mga paketeng naka-hold." --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "Nawawala ang directory ng talaan %spartial." - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "Nawawala ang directory ng arkibo %spartial." - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Ang driver ng paraang %s ay hindi mahanap." - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "Hindi umandar ng tama ang paraang %s" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" -"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter." ++"Pagpalit ng Media: Ikasa ang disk na may pangalang\n" ++" '%s'\n" ++"sa drive '%s' at pindutin ang enter\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Hindi suportado ang sistema ng paketeng '%s'" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " @@@ -2363,7 -2465,7 +2490,7 @@@ msgstr "Kailangan niyong maglagay ng 's #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado." +"Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng tipunang estado." #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" @@@ -2373,7 -2475,7 +2500,7 @@@ msgstr " #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" -msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header" +msgstr "Di tanggap na record sa tipunang pagtatangi, walang Package header" #: apt-pkg/policy.cc:291 #, c-format @@@ -2384,123 -2486,123 +2511,123 @@@ msgstr "Hindi naintindihan ang uri ng p msgid "No priority (or zero) specified for pin" msgstr "Walang prioridad (o sero) na nakatakda para sa pin" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "Hindi akma ang versioning system ng cache" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "May naganap na error habang prinoseso ang %s (NewPackage)" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito." --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito." --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "May naganap na error habang prinoseso ang %s (FindPkg)" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" -msgstr "Kinukuha ang Talaksang Provides" +msgstr "Kinukuha ang Tipunang Provides" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." +msgstr "pagpalit ng pangalan ay sawi, %s (%s -> %s)." - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " +"Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " +"Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " +"Sira ang tipunang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Di tugmang laki" @@@ -2509,7 -2611,7 +2636,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "Block ng nagbebenta %s ay walang fingerprint" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2518,49 -2620,49 +2645,49 @@@ msgstr " "Ginagamit ang %s bilang mount point ng CD-ROM\n" "Sinasalang ang CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Kinikilala..." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "Naka-imbak na Label: %s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "Ina-unmount ang CD-ROM\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "Hinihintay ang disc...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "Sinasalang ang CD-ROM...\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" -msgstr "Sinisiyasat ang Disc para sa talaksang index...\n" +msgstr "Sinisiyasat ang Disc para sa tipunang index...\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na " "signature\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "Hindi yan tanggap na pangalan, subukan muli.\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2569,19 -2671,19 +2696,19 @@@ msgstr " "Ang Disc na ito ay nagngangalang: \n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "Kinokopya ang Listahan ng mga Pakete" - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "Ina-unmount ang CD-ROM..." @@@ -2593,19 -2695,74 +2720,73 @@@ msgstr "Nagsulat ng %i na record.\n #: apt-pkg/indexcopy.cc:263 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n" +msgstr "Nagsulat ng %i na record na may %i na tipunang kulang.\n" #: apt-pkg/indexcopy.cc:266 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n" +msgstr "Nagsulat ng %i na record na may %i na tipunang mismatch\n" #: apt-pkg/indexcopy.cc:269 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang " +"Nagsulat ng %i na record na may %i na tipunang kulang at %i na tipunang " "mismatch\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "Hinahanda ang %s" ++msgstr "Binubuksan %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "Binubuklat ang %s" ++msgstr "Binubuksan %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "Hinahanda ang %s upang isaayos" ++msgstr "Binubuksan ang tipunang pagsasaayos %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "Isasaayos ang %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "Iniluklok ang %s" ++msgstr " Naka-instol: " + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "Naghahanda para sa pagtanggal ng %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "Tinatanggal ang %s" ++msgstr "Binubuksan %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "Tinanggal ang %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "Naghahanda upang tanggalin ang %s kasama ang pagkasaayos nito" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "Tinanggal ang %s kasama ang pagkasaayos nito" ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "Nagsara ng maaga ang koneksyon" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "" -#~ "Hindi kilalang vendor ID '%s' sa linya %u ng talaksang pagkukunan %s" +#~ msgstr "Di kilalang vendor ID '%s' sa linya %u ng tipunang pagkukunan %s" diff --combined po/zh_CN.po index f7c0ae1b3,5f2be979d..984285550 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@@ -1,16 -1,16 +1,16 @@@ # Chinese/Simplified translation of apt. # This file is put in the public domain. -# Tchaikov , 2005. +# Tchaikov , 2004. # Carlos Z.F. Liu , 2004. # msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" -"PO-Revision-Date: 2005-10-29 10:08+0800\n" -"Last-Translator: Tchaikov \n" -"Language-Team: Debian Chinese [GB] \n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" +"PO-Revision-Date: 2005-02-09 17:34+0800\n" +"Last-Translator: Tchaikov \n" +"Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@@ -147,8 -147,8 +147,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ，编译于 %s %s\n" @@@ -206,11 -206,11 +206,11 @@@ msgstr " " showsrc - 显示源文件的各项记录\n" " stats - 显示一些基本的统计信息\n" " dump - 简要显示整个缓存文件的内容\n" -" dumpavail - 把所有有效的包文件列表打印到标准输出\n" +" dumpavail - 把所有有效的包文件列表打印到 stdout\n" " unmet - 显示所有未满足的依赖关系\n" " search - 根据正则表达式搜索软件包列表\n" -" show - 以便于阅读的格式介绍该软件包\n" -" depends - 原原本本地显示该软件包的依赖信息\n" +" show - 显示关于该软件包的便于阅读的一个报告\n" +" depends - 原原本本的显示该软件包的依赖关系的信息\n" " rdepends - 显示所有依赖于该软件包的软件包名字\n" " pkgnames - 列出所有软件包的名字\n" " dotty - 生成可用 GraphVis 处理的软件包关系图\n" @@@ -227,6 -227,19 +227,22 @@@ " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" "若要深入了解，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" -msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。" ++msgstr "" ++"更换介质：请把标有\n" ++"“%s”\n" ++"的碟片插入驱动器“%s”再按回车键\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "参数没有成对" @@@ -284,11 -297,11 +300,11 @@@ msgstr " "\n" "选项：\n" " -h 本帮助文本\n" -" -t 设置 temp 目录\n" +" -t 设置temp目录\n" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" @@@ -297,32 -310,31 +313,32 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "软件包的扩展列表超长" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "处理目录 %s 时出错" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "源扩展列表超长" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "将 header 写到 contents 文件时出错" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "处理 Contents %s 时出错" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@@ -372,8 -384,8 +388,8 @@@ msgstr " " clean 配置文件\n" "\n" "apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n" -"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n" -"和 dpkg-scansources，都能游刃有余\n" +"多种生成索引的方式，从全自动的生成到在功能上对 dpkg-scanpackages \n" +"和 dpkg-scansources 的替代，都能游刃有余\n" "\n" "apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n" "Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n" @@@ -394,18 -406,19 +410,18 @@@ " -h 本帮助文档\n" " --md5 使之生成 MD5 校验和\n" " -s=? 源代码包 override 文件\n" -" -q 输出精简信息\n" -" -d=? 指定可选的缓存数据库\n" +" -q 输出精简信息 -d=? 指定可选的缓存数据库\n" " -d=? 使用另一个可选的缓存数据库\n" " --no-delink 开启delink的调试模式\n" " --contents 使之生成控制内容文件\n" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "没有任何选定项是匹配的" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" @@@ -438,83 -451,83 +454,83 @@@ msgstr "存档没有包含控制字段 msgid "Unable to get a cursor" msgstr "无法获得游标(cursor)" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告：无法读取目录 %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告：无法对 %s 进行统计\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "错误：" - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "警告：" - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "错误：处理文件时出错 " - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "无法解析路径 %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "无法遍历目录树" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "无法打开 %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "无法读取符号链接 %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "无法 unlink %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 无法将 %s 链接到 %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "无法读取 %s 的状态" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "存档没有包含软件包(package)字段" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" @@@ -614,235 -627,255 +630,257 @@@ msgstr "在 unlink %s 时出错 msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "下列的软件包有不能满足的依赖关系：" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装了" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "但却无法安装它" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "但是它只是个虚拟软件包" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "但是它还没有被安装" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr " 或" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "下列的软件包的版本将保持不变：" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "下列的软件包将被升级：" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 +#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "【警告】：下列的重要软件包将被卸载 \n" -"请勿尝试，除非您确实知道您在做什么！" +"请勿尝试，除非您确实清楚您正在执行的操作！" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，" --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "共重新安装了 %lu 个软件包，" --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr " 失败。" --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" -msgstr "无法最小化要升级的软件包集合" +msgstr "无法使升级的软件包集最小化" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " 完成" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。" --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "【警告】：下列的软件包不能通过验证！" +msgstr "【警告】：下列的软件包不能通过认证！" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" -msgstr "忽略了认证警告。\n" ++msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包么？[y/N] " --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" -msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" +msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes。" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" ++msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 ++#, fuzzy + msgid "Internal error, Ordering didn't finish" -msgstr "内部错误，Ordering 没有完成" ++msgstr "添加 diversion 时出现内部错误" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧" ++msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 -#, c-format ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 ++#, fuzzy, c-format + msgid "Couldn't determine free space in %s" -msgstr "无法获知您在 %s 上的空余空间" ++msgstr "您在 %s 上没有足够的空余空间" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 中没有足够的空余空间。" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 -#, c-format ++#: cmdline/apt-get.cc:867 +#, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"您的操作会导致潜在的危害。\n" +"您的操作会导致潜在的危害\n" "若还想继续的话，就输入下面的短句“%s”\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "中止执行。" - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "有一些文件下载失败" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -850,47 -883,47 +888,47 @@@ msgstr " "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "放弃安装。" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意，我选了 %s 而非 %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr " [已安装]" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -901,74 -934,74 +939,93 @@@ msgstr " "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "可是下列的软件包取代了它：" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "软件包 %s 还没有可供安装的候选者" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) 的 %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "下列的信息可能会对问题的解决有所帮助：" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "内部错误，AllUpgrade 造成某些故障" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，AllUpgrade 造成某些故障" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -976,7 -1009,7 +1033,7 @@@ msgstr " "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -987,7 -1020,7 +1044,7 @@@ msgstr " "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -996,112 -1029,121 +1053,118 @@@ msgstr " "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n" "您最好提交一个针对这个软件包的故障报告。" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "下列的信息可能会对问题的解决有所帮助：" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" -msgstr "无法安装的软件包" +msgstr "受损安装包" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "将会安装下列的额外的软件包：" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "建议安装的软件包：" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "推荐安装的软件包：" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "正在筹划升级... " - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失败" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "完成" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 ++#, fuzzy + msgid "Internal error, problem resolver broke stuff" -msgstr "内部错误，problem resolver 坏事了" ++msgstr "内部错误，AllUpgrade 造成某些故障" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "请检查是否安装了“dpkg-dev”软件包。\n" ++msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "子进程出错" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1110,30 -1152,30 +1173,30 @@@ msgstr " "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "被支持模块：" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1379,7 -1421,7 +1442,7 @@@ msgid "Duplicate conf file %s/%s msgstr "重复的配置文件 %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format +#, fuzzy, c-format msgid "Failed to write file %s" msgstr "无法写入文件 %s" @@@ -1435,8 -1477,8 +1498,9 @@@ msgstr "用来覆盖的软件包不属ä msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" @@@ -1466,9 -1508,9 +1530,9 @@@ msgid "The info and temp directories ne msgstr "info 和 temp 目录要求处于同一文件系统之下" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "正在读取软件包列表" @@@ -1574,12 -1616,12 +1638,12 @@@ msgstr "无法在打包文件中找到æ msgid "Unparsable control file" msgstr "不能解析的主控文件" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "无法读取光盘数据库 %s" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1587,28 -1629,33 +1651,34 @@@ msgstr " "请使用 apt-cdrom，通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来" "加入新的光盘。" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "错误的光盘" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" +msgstr "无法卸载现在挂载于 %s 的 CD-ROM，可能它正在使用中。" - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 ++#, fuzzy + msgid "Disk not found." -msgstr "找不到光盘。" ++msgstr "无法找到该文件" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "无法找到该文件" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "无法读取状态" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "无效的 URI，本地的 URI 不能以 // 开头" @@@ -1665,7 -1712,7 +1735,7 @@@ msgstr "连接超时 msgid "Server closed the connection" msgstr "服务器关闭了连接" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "读错误" @@@ -1677,7 -1724,7 +1747,7 @@@ msgstr "回应超出了缓存区大小ã msgid "Protocol corruption" msgstr "协议有误" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "写文件出错" @@@ -1778,43 -1825,79 +1848,81 @@@ msgstr "无法为 %s 创建套接字(f= msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "无法发起与 %s:%s (%s) 的连接" - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "无法连接上 %s:%s (%s)，连接超时" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "无法连接上 %s:%s (%s)。" #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "无法解析域名“%s”" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "暂时不能解析域名“%s”" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "解析“%s:%s”时，出现了某些故障 (%i)" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "不能连接上 %s %s：" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。" ++msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！" ++msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." -msgstr "至少发现一个无效的签名。" ++msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 ++#, fuzzy + msgid "Could not execute " -msgstr "未能执行 " ++msgstr "无法获得锁 %s" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" -msgstr "用于验证签名(您安装了 gnupg 么？)" ++msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" -msgstr "运行 gpgv 时发生未知错误" ++msgstr "" + + #: methods/gpgv.cc:237 ++#, fuzzy + msgid "The following signatures were invalid:\n" -msgstr "下列签名无效：\n" ++msgstr "将会安装下列的额外的软件包：" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" -msgstr "由于没有公钥，下列签名无法进行验证：\n" ++msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1898,10 -1981,6 +2006,6 @@@ msgstr "连接失败 msgid "Internal error" msgstr "内部错误" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "连接被永久关闭" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "无法 mmap 一个空文件" @@@ -1916,57 -1995,57 +2020,57 @@@ msgstr "无法 mmap %lu 字节的数据 msgid "Selection %s not found" msgstr "没有发现您的所选 %s" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "无法识别的类型缩写：“%c”" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "正在打开配置文件 %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "语法错误 %s:%u：配置小节没有以名字开头" - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "语法错误 %s:%u：标签格式有误" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "语法错误 %s:%u：太多的嵌套 include 命令" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "语法错误 %s:%u: Included from here" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "语法错误 %s:%u: 不支持的指令“%s”" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据" @@@ -2032,7 -2111,7 +2136,7 @@@ msgstr "无效的操作 %s msgid "Unable to stat the mount point %s" msgstr "无法读取文件系统挂载点 %s 的状态" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "无法切换工作目录到 %s" @@@ -2041,70 -2120,70 +2145,70 @@@ msgid "Failed to stat the cdrom" msgstr "无法读取光盘的状态" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读，因而无法使用文件锁%s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出了" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "读文件时出错，还剩 %lu 字节没有读出" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "写文件时出错，还剩 %lu 字节没有保存" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "关闭文件时出错" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "用 unlink 删除文件时出错" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "同步文件时出错" @@@ -2177,18 -2256,18 +2281,28 @@@ msgstr "可选 msgid "extra" msgstr "额外" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "正在分析软件包的依赖关系树" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "候选版本" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "生成依赖关系" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "正在合并现有信息" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "无法写入文件 %s" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2199,52 -2278,52 +2313,52 @@@ msgstr "无法解析软件包文件 %s msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "正在打开 %s" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)" @@@ -2265,13 -2344,13 +2379,13 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "不支持索引文件类型“%s”" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2279,38 -2358,48 +2393,51 @@@ msgstr " "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "软件包列表的目录 %spartial 不见了。" - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "找不到“%spartial”这个目录。" - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" -msgstr "正在下载第 %li 个文件(共 %li 个，尚需 %s)" ++msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 -#, c-format ++#, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。" ++msgstr "" ++"更换介质：请把标有\n" ++"“%s”\n" ++"的碟片插入驱动器“%s”再按回车键\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" @@@ -2321,7 -2410,7 +2448,7 @@@ msgstr "无法读取 %s 的状态。 #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI" +msgstr "您必须在您的 sources.list 输入一些“软件包源”的 URL" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." @@@ -2344,82 -2433,82 +2471,82 @@@ msgstr "无法识别锁定的类型(pi msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "软件包暂存区使用的是不兼容的版本控制系统" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "处理 %s (NewPackage)时出错" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "处理 %s (UsePackage1)时出错" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "处理 %s (UsePackage2)时出错" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "处理 %s (NewFileVer1)时出错" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "处理 %s (NewVersion1)时出错" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "处理 %s (UsePackage3)时出错" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "处理 %s (NewVersion2)时出错" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "糟了，软件包的数量了超出本程序的处理能力。" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "糟了，软件包版本的数量了超出本程序的处理能力。" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "糟了，依赖关系的数量超出了本程序的处理能力。" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "处理 %s (FindPkg)时出错" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "处理 %s (CollectFileProvides)时出错" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "无法写入来源缓存文件" @@@ -2428,11 -2517,11 +2555,11 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2441,7 -2530,7 +2568,7 @@@ msgstr " "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2449,13 -2538,13 +2576,13 @@@ msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." -msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" +msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "大小不符" @@@ -2464,7 -2553,7 +2591,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "软件提供者数据块内 %s 没有包含指纹信息" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2473,47 -2562,47 +2600,47 @@@ msgstr " "现把 %s 作为了 CD-ROM 的挂载点\n" "正在挂载 CD-ROM\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "正在鉴别.. " - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "存档标签：%s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "正在卸载 CD-ROM 文件系统\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "等待插入盘片……\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "正在挂载 CD-ROM 文件系统……\n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "正在光盘中查找索引文件..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "这不是一个有效的名字，请再次命名。\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2522,19 -2611,19 +2649,19 @@@ msgstr " "这张光盘现在的名字是：\n" "“%s”\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "正在复制软件包列表……" - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "正在写入新的软件包源列表\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "对应于该光盘的软件包源设置项是：\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "正在卸载 CD-ROM 文件系统……" @@@ -2558,6 -2647,60 +2685,60 @@@ msgstr "已写入 %i æ¡è®°å½•ï¼Œå¹¶æœ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n" + #: apt-pkg/deb/dpkgpm.cc:358 -#, c-format ++#, fuzzy, c-format + msgid "Preparing %s" -msgstr "正在准备 %s" ++msgstr "正在打开 %s" + + #: apt-pkg/deb/dpkgpm.cc:359 -#, c-format ++#, fuzzy, c-format + msgid "Unpacking %s" -msgstr "正在解压缩 %s" ++msgstr "正在打开 %s" + + #: apt-pkg/deb/dpkgpm.cc:364 -#, c-format ++#, fuzzy, c-format + msgid "Preparing to configure %s" -msgstr "正在准备配置 %s" ++msgstr "正在打开配置文件 %s" + + #: apt-pkg/deb/dpkgpm.cc:365 + #, c-format + msgid "Configuring %s" -msgstr "正在配置 %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 -#, c-format ++#, fuzzy, c-format + msgid "Installed %s" -msgstr "已安装 %s" ++msgstr " 已安装：" + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" -msgstr "正在准备 %s 的删除操作" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 -#, c-format ++#, fuzzy, c-format + msgid "Removing %s" -msgstr "正在删除 %s" ++msgstr "正在打开 %s" + + #: apt-pkg/deb/dpkgpm.cc:373 + #, c-format + msgid "Removed %s" -msgstr "已删除 %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" -msgstr "正在准备连同配置文件的删除 %s" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" -msgstr "连同配置文件一同删除 %s " ++msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "连接被永久关闭" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%" diff --combined po/zh_TW.po index f3b425929,53dcde63e..4a6ef2724 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-07-02 11:19-0700\n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" ++"POT-Creation-Date: 2005-11-16 17:15+0100\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@@ -148,8 -148,8 +148,8 @@@ msgid " %4i %s\n 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:2322 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2409 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n" @@@ -228,6 -228,22 +228,22 @@@ msgstr " " -o=? 設定任意指定的設定選項,例如 -o dir::cache=/tmp\n" "若要深入了解,您還可以查閱 apt-cache(8) 和 apt.conf(5) 參考手冊。\n" + #: cmdline/apt-cdrom.cc:78 + msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" + msgstr "" + + #: cmdline/apt-cdrom.cc:93 + #, fuzzy + msgid "Please insert a Disc in the drive and press enter" + msgstr "" + "更換媒體:請把名為\n" + " '%s' 的光碟\n" + "插入 '%s' 碟機,然後按 [Enter] 鍵。\n" + + #: cmdline/apt-cdrom.cc:117 + msgid "Repeat this process for the rest of the CDs in your set." + msgstr "" + #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" msgstr "參數並非一對" @@@ -289,7 -305,7 +305,7 @@@ msgstr " " -c=? 讀取指定的設定檔案\n" " -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n" --#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 ++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:712 #, c-format msgid "Unable to write to %s" msgstr "無法寫入『%s』。" @@@ -298,31 -314,31 +314,31 @@@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "無法取得 debconf 版本。debconf 是否安裝?" - #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 + #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "套件延伸列表過長" - #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 - #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 - #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 + #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 + #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 + #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "處理目錄 %s 時錯誤" - #: ftparchive/apt-ftparchive.cc:250 + #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "原碼的延伸列表太長" - #: ftparchive/apt-ftparchive.cc:367 + #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "寫入標頭資訊到目錄檔案時出錯" - #: ftparchive/apt-ftparchive.cc:397 + #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "處理目錄 %s 時出錯" - #: ftparchive/apt-ftparchive.cc:551 + #: ftparchive/apt-ftparchive.cc:556 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@@ -403,11 -419,11 +419,11 @@@ msgstr " " -c=? 讀取指定的設定檔\n" " -o=? 設定任意指定的設定選項" - #: ftparchive/apt-ftparchive.cc:757 + #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "找不到符合的選項" - #: ftparchive/apt-ftparchive.cc:830 + #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "套件檔案組 `%s' 缺少部份檔案" @@@ -440,83 -456,83 +456,83 @@@ msgstr "檔案沒有 control 記錄 msgid "Unable to get a cursor" msgstr "無法取得游標" - #: ftparchive/writer.cc:79 + #: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W:無法讀取目錄 %s\n" - #: ftparchive/writer.cc:84 + #: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "W:無法取得 %s 狀態\n" - #: ftparchive/writer.cc:126 + #: ftparchive/writer.cc:125 msgid "E: " msgstr "錯誤：" - #: ftparchive/writer.cc:128 + #: ftparchive/writer.cc:127 msgid "W: " msgstr "警告：" - #: ftparchive/writer.cc:135 + #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " msgstr "E:套用到檔案時出錯" - #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 + #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "無法解析路徑 %s" - #: ftparchive/writer.cc:164 + #: ftparchive/writer.cc:163 msgid "Tree walking failed" msgstr "無法走訪目錄樹" - #: ftparchive/writer.cc:189 + #: ftparchive/writer.cc:188 #, c-format msgid "Failed to open %s" msgstr "無法開啟 %s" - #: ftparchive/writer.cc:246 + #: ftparchive/writer.cc:245 #, c-format msgid " DeLink %s [%s]\n" msgstr " 移除連結 %s [%s]\n" - #: ftparchive/writer.cc:254 + #: ftparchive/writer.cc:253 #, c-format msgid "Failed to readlink %s" msgstr "無法讀取符號鏈接 %s" - #: ftparchive/writer.cc:258 + #: ftparchive/writer.cc:257 #, c-format msgid "Failed to unlink %s" msgstr "無法 unlink %s" - #: ftparchive/writer.cc:265 + #: ftparchive/writer.cc:264 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 無法將 %s 鏈接到 %s" - #: ftparchive/writer.cc:275 + #: ftparchive/writer.cc:274 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的上限 %sB。\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 - #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 + #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "無法取得 %s 的狀態" - #: ftparchive/writer.cc:378 + #: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "檔案無套件字符" - #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 + #: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s 無 override 項目\n" - #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 + #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 套件維護者是 %s 非 %s\n" @@@ -616,79 -632,79 +632,79 @@@ msgstr "在 unlink %s 時出錯 msgid "Failed to rename %s to %s" msgstr "無法將 %s 更名為 %s" --#: cmdline/apt-get.cc:118 ++#: cmdline/apt-get.cc:119 msgid "Y" msgstr "Y" - #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 ++#: cmdline/apt-get.cc:141 cmdline/apt-get.cc:1565 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示法出錯 - %s" --#: cmdline/apt-get.cc:235 ++#: cmdline/apt-get.cc:236 msgid "The following packages have unmet dependencies:" msgstr "下列的套件有無法滿足的依存關係：" --#: cmdline/apt-get.cc:325 ++#: cmdline/apt-get.cc:326 #, c-format msgid "but %s is installed" msgstr "但是『%s』卻已經安裝好了。" --#: cmdline/apt-get.cc:327 ++#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is to be installed" msgstr "但是『%s』卻將被安裝。" --#: cmdline/apt-get.cc:334 ++#: cmdline/apt-get.cc:335 msgid "but it is not installable" msgstr "但是它卻無法安裝。" --#: cmdline/apt-get.cc:336 ++#: cmdline/apt-get.cc:337 msgid "but it is a virtual package" msgstr "但是它只是虛擬的套件" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not installed" msgstr "但是『%s』卻還沒有安裝。" --#: cmdline/apt-get.cc:339 ++#: cmdline/apt-get.cc:340 msgid "but it is not going to be installed" msgstr "但是它卻不會被安裝。" --#: cmdline/apt-get.cc:344 ++#: cmdline/apt-get.cc:345 msgid " or" msgstr "或" --#: cmdline/apt-get.cc:373 ++#: cmdline/apt-get.cc:374 msgid "The following NEW packages will be installed:" msgstr "下列的【新】套件都將被安裝：" --#: cmdline/apt-get.cc:399 ++#: cmdline/apt-get.cc:400 msgid "The following packages will be REMOVED:" msgstr "下列的套件都將被【刪除】：" --#: cmdline/apt-get.cc:421 ++#: cmdline/apt-get.cc:422 msgid "The following packages have been kept back:" msgstr "下列的套件都將維持舊版本:" --#: cmdline/apt-get.cc:442 ++#: cmdline/apt-get.cc:443 msgid "The following packages will be upgraded:" msgstr "下列的套件都將更新:" --#: cmdline/apt-get.cc:463 ++#: cmdline/apt-get.cc:464 msgid "The following packages will be DOWNGRADED:" msgstr "下列的套件都將被「降級」:" --#: cmdline/apt-get.cc:483 ++#: cmdline/apt-get.cc:484 msgid "The following held packages will be changed:" msgstr "下列押後的套件都將被更改：" --#: cmdline/apt-get.cc:536 ++#: cmdline/apt-get.cc:537 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" --#: cmdline/apt-get.cc:544 ++#: cmdline/apt-get.cc:545 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@@ -697,122 -713,144 +713,144 @@@ msgstr " "警告：下列的重要套件都將被刪除\n" "除非您很清楚在做什麼，請勿輕易嘗試。" --#: cmdline/apt-get.cc:575 ++#: cmdline/apt-get.cc:576 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "更新 %lu 個套件，新安裝 %lu 個套件，" --#: cmdline/apt-get.cc:579 ++#: cmdline/apt-get.cc:580 #, c-format msgid "%lu reinstalled, " msgstr "重新安裝 %lu 個套件，" --#: cmdline/apt-get.cc:581 ++#: cmdline/apt-get.cc:582 #, c-format msgid "%lu downgraded, " msgstr "降 %lu 個套件的版，" --#: cmdline/apt-get.cc:583 ++#: cmdline/apt-get.cc:584 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n" --#: cmdline/apt-get.cc:587 ++#: cmdline/apt-get.cc:588 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n" --#: cmdline/apt-get.cc:647 ++#: cmdline/apt-get.cc:648 msgid "Correcting dependencies..." msgstr "更正依存關係中..." --#: cmdline/apt-get.cc:650 ++#: cmdline/apt-get.cc:651 msgid " failed." msgstr "失敗" --#: cmdline/apt-get.cc:653 ++#: cmdline/apt-get.cc:654 msgid "Unable to correct dependencies" msgstr "無法更正依存關係。" --#: cmdline/apt-get.cc:656 ++#: cmdline/apt-get.cc:657 msgid "Unable to minimize the upgrade set" msgstr "無法最小化升級的套件集合" --#: cmdline/apt-get.cc:658 ++#: cmdline/apt-get.cc:659 msgid " Done" msgstr " 完成" --#: cmdline/apt-get.cc:662 ++#: cmdline/apt-get.cc:663 msgid "You might want to run `apt-get -f install' to correct these." msgstr "用『apt-get -f install』指令或許能修正這些問題。" --#: cmdline/apt-get.cc:665 ++#: cmdline/apt-get.cc:666 msgid "Unmet dependencies. Try using -f." msgstr "無法滿足相依關係。試試看 -f 選項。" --#: cmdline/apt-get.cc:687 ++#: cmdline/apt-get.cc:688 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告：下列的套件驗證失敗！" - #: cmdline/apt-get.cc:698 -#: cmdline/apt-get.cc:691 ++#: cmdline/apt-get.cc:692 + msgid "Authentication warning overridden.\n" + msgstr "" + -#: cmdline/apt-get.cc:698 ++#: cmdline/apt-get.cc:699 msgid "Install these packages without verification [y/N]? " msgstr "不驗證這些套件就直接安裝？[y/N]" --#: cmdline/apt-get.cc:700 ++#: cmdline/apt-get.cc:701 msgid "Some packages could not be authenticated" msgstr "部份套件無法驗證" - #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 -#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 ++#: cmdline/apt-get.cc:710 cmdline/apt-get.cc:857 msgid "There are problems and -y was used without --force-yes" msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes" - #: cmdline/apt-get.cc:762 -#: cmdline/apt-get.cc:753 ++#: cmdline/apt-get.cc:754 + msgid "Internal error, InstallPackages was called with broken packages!" + msgstr "" + -#: cmdline/apt-get.cc:762 ++#: cmdline/apt-get.cc:763 msgid "Packages need to be removed but remove is disabled." msgstr "有套件需要被移除,但移除動作被禁止。" - #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:773 ++#: cmdline/apt-get.cc:774 + #, fuzzy + msgid "Internal error, Ordering didn't finish" + msgstr "內部錯誤：新增轉移(diversion)失敗" + -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 ++#: cmdline/apt-get.cc:790 cmdline/apt-get.cc:1864 cmdline/apt-get.cc:1897 msgid "Unable to lock the download directory" msgstr "無法鎖定下載的目錄" - #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 ++#: cmdline/apt-get.cc:800 cmdline/apt-get.cc:1945 cmdline/apt-get.cc:2157 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "無法讀取來源單。" - #: cmdline/apt-get.cc:818 -#: cmdline/apt-get.cc:814 ++#: cmdline/apt-get.cc:815 + msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" + msgstr "" + -#: cmdline/apt-get.cc:819 ++#: cmdline/apt-get.cc:820 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n" - #: cmdline/apt-get.cc:821 -#: cmdline/apt-get.cc:822 ++#: cmdline/apt-get.cc:823 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下載 %sB 的檔案。\n" - #: cmdline/apt-get.cc:826 -#: cmdline/apt-get.cc:827 ++#: cmdline/apt-get.cc:828 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解壓縮後將消耗 %sB 的空間。\n" - #: cmdline/apt-get.cc:829 -#: cmdline/apt-get.cc:830 ++#: cmdline/apt-get.cc:831 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解壓縮後將空出 %sB 的空間。\n" - #: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 ++#: cmdline/apt-get.cc:845 cmdline/apt-get.cc:2011 + #, fuzzy, c-format + msgid "Couldn't determine free space in %s" + msgstr "『%s』內沒有足夠的空間。" + -#: cmdline/apt-get.cc:847 ++#: cmdline/apt-get.cc:848 #, c-format msgid "You don't have enough free space in %s." msgstr "『%s』內沒有足夠的空間。" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 -#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 ++#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:883 msgid "Trivial Only specified but this is not a trivial operation." msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。" - #: cmdline/apt-get.cc:863 -#: cmdline/apt-get.cc:864 ++#: cmdline/apt-get.cc:865 msgid "Yes, do as I say!" msgstr "是的,請執行我所指定的" - #: cmdline/apt-get.cc:865 -#: cmdline/apt-get.cc:866 ++#: cmdline/apt-get.cc:867 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@@ -823,28 -861,28 +861,28 @@@ msgstr " "若要繼續的話,就輸入下面的句子“%s”\n" " ?] " - #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 -#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 ++#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:892 msgid "Abort." msgstr "放棄執行。" - #: cmdline/apt-get.cc:886 -#: cmdline/apt-get.cc:887 ++#: cmdline/apt-get.cc:888 msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " - #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 ++#: cmdline/apt-get.cc:960 cmdline/apt-get.cc:1364 cmdline/apt-get.cc:2054 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法下載『%s』檔案。%s\n" - #: cmdline/apt-get.cc:976 -#: cmdline/apt-get.cc:977 ++#: cmdline/apt-get.cc:978 msgid "Some files failed to download" msgstr "部份檔案無法下載" - #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 ++#: cmdline/apt-get.cc:979 cmdline/apt-get.cc:2063 msgid "Download complete and in download only mode" msgstr "下載完畢,目前是“僅下載”模式" - #: cmdline/apt-get.cc:983 -#: cmdline/apt-get.cc:984 ++#: cmdline/apt-get.cc:985 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@@ -852,47 -890,47 +890,47 @@@ msgstr " "有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n" "選項?" - #: cmdline/apt-get.cc:987 -#: cmdline/apt-get.cc:988 ++#: cmdline/apt-get.cc:989 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)" - #: cmdline/apt-get.cc:992 -#: cmdline/apt-get.cc:993 ++#: cmdline/apt-get.cc:994 msgid "Unable to correct missing packages." msgstr "無法更正遺失的套件。" - #: cmdline/apt-get.cc:993 -#: cmdline/apt-get.cc:994 ++#: cmdline/apt-get.cc:995 msgid "Aborting install." msgstr "放棄安裝。" - #: cmdline/apt-get.cc:1026 -#: cmdline/apt-get.cc:1028 ++#: cmdline/apt-get.cc:1029 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意,選擇了 %s 而非 %s\n" - #: cmdline/apt-get.cc:1036 -#: cmdline/apt-get.cc:1038 ++#: cmdline/apt-get.cc:1039 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n" - #: cmdline/apt-get.cc:1054 -#: cmdline/apt-get.cc:1056 ++#: cmdline/apt-get.cc:1057 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "套件『%s』沒有安裝，所以無法刪除。\n" - #: cmdline/apt-get.cc:1065 -#: cmdline/apt-get.cc:1067 ++#: cmdline/apt-get.cc:1068 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "虛擬套件『%s』的提供者是：\n" - #: cmdline/apt-get.cc:1077 -#: cmdline/apt-get.cc:1079 ++#: cmdline/apt-get.cc:1080 msgid " [Installed]" msgstr "【已安裝】" - #: cmdline/apt-get.cc:1082 -#: cmdline/apt-get.cc:1084 ++#: cmdline/apt-get.cc:1085 msgid "You should explicitly select one to install." msgstr "請您明確地選擇一個來進行安裝。" - #: cmdline/apt-get.cc:1087 -#: cmdline/apt-get.cc:1089 ++#: cmdline/apt-get.cc:1090 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@@ -903,73 -941,73 +941,92 @@@ msgstr " "這可能意味著這個套件已經消失或捨棄,\n" "或者只能在其他原碼中找到\n" - #: cmdline/apt-get.cc:1106 -#: cmdline/apt-get.cc:1108 ++#: cmdline/apt-get.cc:1109 msgid "However the following packages replace it:" msgstr "但是下列的套件將取代它：" - #: cmdline/apt-get.cc:1109 -#: cmdline/apt-get.cc:1111 ++#: cmdline/apt-get.cc:1112 #, c-format msgid "Package %s has no installation candidate" msgstr "套件 %s 還沒有可供安裝的候選版本" - #: cmdline/apt-get.cc:1129 -#: cmdline/apt-get.cc:1131 ++#: cmdline/apt-get.cc:1132 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安裝 %s,因為無法下載它。\n" - #: cmdline/apt-get.cc:1137 -#: cmdline/apt-get.cc:1139 ++#: cmdline/apt-get.cc:1140 #, c-format msgid "%s is already the newest version.\n" msgstr "『%s』已經是最新版本了。\n" - #: cmdline/apt-get.cc:1164 -#: cmdline/apt-get.cc:1166 ++#: cmdline/apt-get.cc:1167 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”發布版本" - #: cmdline/apt-get.cc:1166 -#: cmdline/apt-get.cc:1168 ++#: cmdline/apt-get.cc:1169 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" - #: cmdline/apt-get.cc:1172 -#: cmdline/apt-get.cc:1174 ++#: cmdline/apt-get.cc:1175 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "選定的版本為 %s (%s) 的 %s\n" - #: cmdline/apt-get.cc:1282 -#: cmdline/apt-get.cc:1315 ++#: cmdline/apt-get.cc:1312 msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" - #: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 ++#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1465 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" - #: cmdline/apt-get.cc:1353 -#: cmdline/apt-get.cc:1386 ++#: cmdline/apt-get.cc:1383 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。" - #: cmdline/apt-get.cc:1372 -#: cmdline/apt-get.cc:1405 ++#: cmdline/apt-get.cc:1397 ++msgid "We are not supposed to delete stuff, can't start AutoRemover" ++msgstr "" ++ ++#: cmdline/apt-get.cc:1422 ++msgid "" ++"Hmm, seems like the AutoRemover destroyed something which really\n" ++"shouldn't happen. Please file a bug report against apt." ++msgstr "" ++ ++#: cmdline/apt-get.cc:1425 cmdline/apt-get.cc:1633 ++msgid "The following information may help to resolve the situation:" ++msgstr "底下的資訊有助於解決現在的情況:" ++ ++#: cmdline/apt-get.cc:1429 ++#, fuzzy ++msgid "Internal Error, AutoRemover broke stuff" ++msgstr "內部錯誤,AllUpgrade 造成錯誤" ++ ++#: cmdline/apt-get.cc:1448 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" - #: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 ++#: cmdline/apt-get.cc:1552 cmdline/apt-get.cc:1588 #, c-format msgid "Couldn't find package %s" msgstr "無法找到 %s 套件。" - #: cmdline/apt-get.cc:1494 -#: cmdline/apt-get.cc:1527 ++#: cmdline/apt-get.cc:1575 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n" - #: cmdline/apt-get.cc:1524 -#: cmdline/apt-get.cc:1557 ++#: cmdline/apt-get.cc:1605 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "用『apt-get -f install』指令或許能修正這些問題。" - #: cmdline/apt-get.cc:1527 -#: cmdline/apt-get.cc:1560 ++#: cmdline/apt-get.cc:1608 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -977,7 -1015,7 +1034,7 @@@ msgstr " "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n" "定一個解決辦法)。" - #: cmdline/apt-get.cc:1539 -#: cmdline/apt-get.cc:1572 ++#: cmdline/apt-get.cc:1620 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" @@@ -988,7 -1026,7 +1045,7 @@@ msgstr " "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" "或從 Incoming 目錄移除。" - #: cmdline/apt-get.cc:1547 -#: cmdline/apt-get.cc:1580 ++#: cmdline/apt-get.cc:1628 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" @@@ -998,112 -1036,122 +1055,118 @@@ msgstr " "該套件無法安裝,您最好提交一個針對這個套件\n" "的臭蟲報告。" - #: cmdline/apt-get.cc:1552 -#: cmdline/apt-get.cc:1585 --msgid "The following information may help to resolve the situation:" --msgstr "底下的資訊有助於解決現在的情況:" -- - #: cmdline/apt-get.cc:1555 -#: cmdline/apt-get.cc:1588 ++#: cmdline/apt-get.cc:1636 msgid "Broken packages" msgstr "損毀的套件" - #: cmdline/apt-get.cc:1581 -#: cmdline/apt-get.cc:1614 ++#: cmdline/apt-get.cc:1667 msgid "The following extra packages will be installed:" msgstr "下列的【新】套件都將被安裝：" - #: cmdline/apt-get.cc:1652 -#: cmdline/apt-get.cc:1685 ++#: cmdline/apt-get.cc:1738 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" - #: cmdline/apt-get.cc:1653 -#: cmdline/apt-get.cc:1686 ++#: cmdline/apt-get.cc:1739 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" - #: cmdline/apt-get.cc:1673 -#: cmdline/apt-get.cc:1706 ++#: cmdline/apt-get.cc:1759 msgid "Calculating upgrade... " msgstr "籌畫升級套件中..." - #: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1762 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失敗" - #: cmdline/apt-get.cc:1681 -#: cmdline/apt-get.cc:1714 ++#: cmdline/apt-get.cc:1767 msgid "Done" msgstr "完成" - #: cmdline/apt-get.cc:1854 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 ++#: cmdline/apt-get.cc:1832 cmdline/apt-get.cc:1840 + #, fuzzy + msgid "Internal error, problem resolver broke stuff" + msgstr "內部錯誤,AllUpgrade 造成錯誤" + -#: cmdline/apt-get.cc:1887 ++#: cmdline/apt-get.cc:1940 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個對應的套件才能下載源碼" - #: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 ++#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2175 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 套件的源碼" - #: cmdline/apt-get.cc:1928 -#: cmdline/apt-get.cc:1961 ++#: cmdline/apt-get.cc:2014 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足夠的空間。" - #: cmdline/apt-get.cc:1933 -#: cmdline/apt-get.cc:1966 ++#: cmdline/apt-get.cc:2019 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" - #: cmdline/apt-get.cc:1936 -#: cmdline/apt-get.cc:1969 ++#: cmdline/apt-get.cc:2022 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始檔案。\n" - #: cmdline/apt-get.cc:1942 -#: cmdline/apt-get.cc:1975 ++#: cmdline/apt-get.cc:2028 #, c-format msgid "Fetch source %s\n" msgstr "下載源碼 %s\n" - #: cmdline/apt-get.cc:1973 -#: cmdline/apt-get.cc:2006 ++#: cmdline/apt-get.cc:2059 msgid "Failed to fetch some archives." msgstr "無法下載某些檔案。" - #: cmdline/apt-get.cc:2001 -#: cmdline/apt-get.cc:2034 ++#: cmdline/apt-get.cc:2087 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" - #: cmdline/apt-get.cc:2013 -#: cmdline/apt-get.cc:2046 ++#: cmdline/apt-get.cc:2099 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" - #: cmdline/apt-get.cc:2030 -#: cmdline/apt-get.cc:2047 ++#: cmdline/apt-get.cc:2100 + #, c-format + msgid "Check if the 'dpkg-dev' package is installed.\n" + msgstr "" + -#: cmdline/apt-get.cc:2064 ++#: cmdline/apt-get.cc:2117 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" - #: cmdline/apt-get.cc:2049 -#: cmdline/apt-get.cc:2083 ++#: cmdline/apt-get.cc:2136 msgid "Child process failed" msgstr "子程序失敗" - #: cmdline/apt-get.cc:2065 -#: cmdline/apt-get.cc:2099 ++#: cmdline/apt-get.cc:2152 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" - #: cmdline/apt-get.cc:2093 -#: cmdline/apt-get.cc:2127 ++#: cmdline/apt-get.cc:2180 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的建構相依關係。" - #: cmdline/apt-get.cc:2113 -#: cmdline/apt-get.cc:2147 ++#: cmdline/apt-get.cc:2200 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相依關係訊息。\n" - #: cmdline/apt-get.cc:2165 -#: cmdline/apt-get.cc:2199 ++#: cmdline/apt-get.cc:2252 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係" - #: cmdline/apt-get.cc:2217 -#: cmdline/apt-get.cc:2251 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1112,30 -1160,30 +1175,30 @@@ msgstr " "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" "相依關係" - #: cmdline/apt-get.cc:2252 -#: cmdline/apt-get.cc:2286 ++#: cmdline/apt-get.cc:2339 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了" - #: cmdline/apt-get.cc:2277 -#: cmdline/apt-get.cc:2311 ++#: cmdline/apt-get.cc:2364 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2325 ++#: cmdline/apt-get.cc:2378 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所要求的建構相依關係。" - #: cmdline/apt-get.cc:2295 -#: cmdline/apt-get.cc:2329 ++#: cmdline/apt-get.cc:2382 msgid "Failed to process build dependencies" msgstr "無法處理建構相依關係" - #: cmdline/apt-get.cc:2327 -#: cmdline/apt-get.cc:2361 ++#: cmdline/apt-get.cc:2414 msgid "Supported modules:" msgstr "支援模組:" - #: cmdline/apt-get.cc:2368 -#: cmdline/apt-get.cc:2402 ++#: cmdline/apt-get.cc:2455 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1439,8 -1487,8 +1502,9 @@@ msgstr "複寫套件 %s 無符合版本 msgid "File %s/%s overwrites the one in the package %s" msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案" - #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 - #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 + #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 ++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 ++#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "無法讀取『%s』。" @@@ -1470,9 -1518,9 +1534,9 @@@ msgid "The info and temp directories ne msgstr "資料目錄與暫存目錄需在同一檔案系統" #. Build the status cache --#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 --#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 --#: apt-pkg/pkgcachegen.cc:840 ++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:645 ++#: apt-pkg/pkgcachegen.cc:714 apt-pkg/pkgcachegen.cc:719 ++#: apt-pkg/pkgcachegen.cc:842 msgid "Reading package lists" msgstr "讀取套件清單中" @@@ -1578,12 -1626,12 +1642,12 @@@ msgstr "找不到有效的 control 檔æ msgid "Unparsable control file" msgstr "無法分析的 control 檔案" - #: methods/cdrom.cc:113 + #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" msgstr "無法讀取碟片資料庫『%s』。" - #: methods/cdrom.cc:122 + #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@@ -1591,28 -1639,34 +1655,34 @@@ msgstr " "要讓本程式辨認此碟片，請用『apt-cdrom』工具。『apt-get update』不能用來製造新" "的碟片。" - #: methods/cdrom.cc:130 methods/cdrom.cc:168 + #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "碟片不正確。" - #: methods/cdrom.cc:163 + #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。" - #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 + #: methods/cdrom.cc:169 + #, fuzzy + msgid "Disk not found." + msgstr "找不到檔案" + + #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "找不到檔案" - #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 + #: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 + #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "無法讀取資料" - #: methods/copy.cc:79 methods/gzip.cc:139 + #: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "日期更新失敗" - #: methods/file.cc:42 + #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "通用資源識別號錯誤。本機資源識別號不應以『//』起頭。" @@@ -1668,7 -1722,7 +1738,7 @@@ msgstr "連線逾時 msgid "Server closed the connection" msgstr "伺服器關閉聯線。" - #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 + #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "讀取失敗。" @@@ -1680,7 -1734,7 +1750,7 @@@ msgstr "答覆超過緩衝區長度。 msgid "Protocol corruption" msgstr "協定失敗。" - #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 + #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "寫入失敗。" @@@ -1781,43 -1835,81 +1851,81 @@@ msgstr "無法建立到『%s』的 sock msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "無法聯絡到主機『%s:%s (%s)』。" - #: methods/connect.cc:92 + #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "無法聯絡到主機『%s:%s (%s)』。" - #: methods/connect.cc:104 + #: methods/connect.cc:106 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "無法聯絡到主機『%s:%s (%s)』。" #. We say this mainly because the pause here is for the #. ssh connection that is still going - #: methods/connect.cc:132 methods/rsh.cc:425 + #: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "聯絡主機『%s』中" - #: methods/connect.cc:163 + #: methods/connect.cc:165 #, c-format msgid "Could not resolve '%s'" msgstr "無法解析位置 %s" - #: methods/connect.cc:167 + #: methods/connect.cc:171 #, c-format msgid "Temporary failure resolving '%s'" msgstr "解析『%s』暫時失敗" - #: methods/connect.cc:169 + #: methods/connect.cc:174 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "無法解析『%s:%s (%i)』。" - #: methods/connect.cc:216 + #: methods/connect.cc:221 #, c-format msgid "Unable to connect to %s %s:" msgstr "無法聯絡到主機『%s %s』：" + #: methods/gpgv.cc:92 + msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." + msgstr "" + + #: methods/gpgv.cc:191 + msgid "" + "Internal error: Good signature, but could not determine key fingerprint?!" + msgstr "" + + #: methods/gpgv.cc:196 + msgid "At least one invalid signature was encountered." + msgstr "" + + #. FIXME String concatenation considered harmful. + #: methods/gpgv.cc:201 + #, fuzzy + msgid "Could not execute " + msgstr "無法取得『%s』鎖。" + + #: methods/gpgv.cc:202 + msgid " to verify signature (is gnupg installed?)" + msgstr "" + + #: methods/gpgv.cc:206 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:237 + #, fuzzy + msgid "The following signatures were invalid:\n" + msgstr "下列的【新】套件都將被安裝：" + + #: methods/gpgv.cc:244 + msgid "" + "The following signatures couldn't be verified because the public key is not " + "available:\n" + msgstr "" + #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" @@@ -1901,10 -1993,6 +2009,6 @@@ msgstr "連線失敗 msgid "Internal error" msgstr "內部錯誤" - #: methods/rsh.cc:330 - msgid "Connection closed prematurely" - msgstr "連線不預期的結束" - #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "不能將空白檔案讀入記憶體" @@@ -1919,57 -2007,57 +2023,57 @@@ msgstr "無法讀入檔案 %lu ä½å…ƒçµ msgid "Selection %s not found" msgstr "選項『%s』找不到。" - #: apt-pkg/contrib/configuration.cc:395 + #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "不認識的簡寫類型：%c" - #: apt-pkg/contrib/configuration.cc:453 + #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" msgstr "開啟組態檔 %s" - #: apt-pkg/contrib/configuration.cc:471 + #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" msgstr "第 %d 行太長（最長 %d）" - #: apt-pkg/contrib/configuration.cc:567 + #: apt-pkg/contrib/configuration.cc:608 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "語法錯誤 %s:%u: 區塊沒有名稱" - #: apt-pkg/contrib/configuration.cc:586 + #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "語法錯誤 %s:%u: 無效的標籤" - #: apt-pkg/contrib/configuration.cc:603 + #: apt-pkg/contrib/configuration.cc:644 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "語法錯誤 %s:%u: 值後有多餘的垃圾" - #: apt-pkg/contrib/configuration.cc:643 + #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "語法錯誤： %s:%u： 指令只能於最高層級執行" - #: apt-pkg/contrib/configuration.cc:650 + #: apt-pkg/contrib/configuration.cc:691 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "語法錯誤 %s:%u: 太多重複引入檔案" - #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 + #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "語法錯誤 %s:%u: 從此引入" - #: apt-pkg/contrib/configuration.cc:663 + #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'" - #: apt-pkg/contrib/configuration.cc:697 + #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾" @@@ -2035,7 -2123,7 +2139,7 @@@ msgstr "無效的操作：%s msgid "Unable to stat the mount point %s" msgstr "無法讀取掛載點 %s" - #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 + #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "無法進入『%s』目錄。" @@@ -2044,70 -2132,70 +2148,70 @@@ msgid "Failed to stat the cdrom" msgstr "CD-ROM 狀況讀取失敗" - #: apt-pkg/contrib/fileutl.cc:80 + #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" msgstr "不使用檔案鎖定於唯獨檔案 %s" - #: apt-pkg/contrib/fileutl.cc:85 + #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" msgstr "無法開啟『%s』鎖定檔。" - #: apt-pkg/contrib/fileutl.cc:103 + #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "不使用檔案鎖定於 nfs 掛載點上得檔案 %s" - #: apt-pkg/contrib/fileutl.cc:107 + #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" msgstr "無法取得『%s』鎖。" - #: apt-pkg/contrib/fileutl.cc:359 + #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待 %s 但是它不存在" - #: apt-pkg/contrib/fileutl.cc:369 + #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子程序 %s 收到一個記憶體錯誤" - #: apt-pkg/contrib/fileutl.cc:372 + #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子程序 %s 回傳錯誤碼(%u)" - #: apt-pkg/contrib/fileutl.cc:374 + #: apt-pkg/contrib/fileutl.cc:392 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子程序 %s 不預期的結束" - #: apt-pkg/contrib/fileutl.cc:418 + #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" msgstr "無法開啟『%s』檔案。" - #: apt-pkg/contrib/fileutl.cc:474 + #: apt-pkg/contrib/fileutl.cc:492 #, c-format msgid "read, still have %lu to read but none left" msgstr "讀取，仍有 %lu 未讀" - #: apt-pkg/contrib/fileutl.cc:504 + #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但無法寫入" - #: apt-pkg/contrib/fileutl.cc:579 + #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" msgstr "程式關閉檔案" - #: apt-pkg/contrib/fileutl.cc:585 + #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" msgstr "程式刪除檔案" - #: apt-pkg/contrib/fileutl.cc:596 + #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" msgstr "程式同步檔案" @@@ -2180,18 -2268,18 +2284,28 @@@ msgstr "次要 msgid "extra" msgstr "添加" --#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 ++#: apt-pkg/depcache.cc:99 apt-pkg/depcache.cc:128 msgid "Building dependency tree" msgstr "了解套件依存關係中" --#: apt-pkg/depcache.cc:61 ++#: apt-pkg/depcache.cc:100 msgid "Candidate versions" msgstr "候選版本" --#: apt-pkg/depcache.cc:90 ++#: apt-pkg/depcache.cc:129 msgid "Dependency generation" msgstr "產生套件依存關係" ++#: apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:169 apt-pkg/depcache.cc:173 ++#, fuzzy ++msgid "Reading state information" ++msgstr "結合現有資料中" ++ ++#: apt-pkg/depcache.cc:189 ++#, fuzzy, c-format ++msgid "Failed to write StateFile %s" ++msgstr "寫入檔案 %s 失敗" ++ #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" @@@ -2202,52 -2290,52 +2316,52 @@@ msgstr "無法辨識套件『%s』(1)〠msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件『%s』(1)。" --#: apt-pkg/sourcelist.cc:87 ++#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號)。" --#: apt-pkg/sourcelist.cc:89 ++#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本)。" --#: apt-pkg/sourcelist.cc:92 ++#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號分辨)。" --#: apt-pkg/sourcelist.cc:98 ++#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。" --#: apt-pkg/sourcelist.cc:105 ++#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。" --#: apt-pkg/sourcelist.cc:156 ++#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "開啟『%s』中" - #: apt-pkg/sourcelist.cc:170 -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 ++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "來源檔『%2$s』第 %1$u 行太長。" --#: apt-pkg/sourcelist.cc:187 ++#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。" --#: apt-pkg/sourcelist.cc:191 --#, c-format --msgid "Type '%s' is not known on line %u in source list %s" ++#: apt-pkg/sourcelist.cc:244 ++#, fuzzy, c-format ++msgid "Type '%s' is not known in on line %u in source list %s" msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行" --#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 ++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。" @@@ -2267,48 -2355,61 +2381,61 @@@ msgstr " msgid "Index file type '%s' is not supported" msgstr "本軟體不支持『%s』型的索引檔。" --#: apt-pkg/algorithms.cc:241 ++#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。" --#: apt-pkg/algorithms.cc:1059 ++#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "無法解決依存關係。可能原因是某些套件被押後。" --#: apt-pkg/algorithms.cc:1061 ++#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "無法解決問題，因為某些損毀的套件被押後。" - #: apt-pkg/acquire.cc:61 + #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." msgstr "找不到『%spartial』清單目錄。" - #: apt-pkg/acquire.cc:65 + #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." msgstr "找不到『%spartial』檔案目錄。" - #: apt-pkg/acquire-worker.cc:112 + #: apt-pkg/acquire.cc:817 + #, c-format + msgid "Downloading file %li of %li (%s remaining)" + msgstr "" + + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "找不到安裝方式『%s』的驅動程式。" - #: apt-pkg/acquire-worker.cc:161 + #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" msgstr "安裝方式『%s』沒有正確啟動。" - #: apt-pkg/init.cc:119 + #: apt-pkg/acquire-worker.cc:377 + #, fuzzy, c-format + msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." + msgstr "" + "更換媒體:請把名為\n" + " '%s' 的光碟\n" + "插入 '%s' 碟機,然後按 [Enter] 鍵。\n" + -#: apt-pkg/init.cc:119 ++#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "本軟體不支持『%s』包裝法。" --#: apt-pkg/init.cc:135 ++#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "無法明白系統類別。" @@@ -2342,82 -2443,82 +2469,82 @@@ msgstr "本軟體不支持『%sã€åž‹çš msgid "No priority (or zero) specified for pin" msgstr "對於釘住的檔案無優先順序" --#: apt-pkg/pkgcachegen.cc:74 ++#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "套件暫存檔使用的是不相容的版本系統。" --#: apt-pkg/pkgcachegen.cc:117 ++#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "處理『%s』時發生錯誤 (NewPackage)。" --#: apt-pkg/pkgcachegen.cc:129 ++#: apt-pkg/pkgcachegen.cc:131 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "處理『%s』時發生錯誤 (UsePackage1)。" --#: apt-pkg/pkgcachegen.cc:150 ++#: apt-pkg/pkgcachegen.cc:152 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "處理『%s』時發生錯誤 (UsePackage2)。" --#: apt-pkg/pkgcachegen.cc:154 ++#: apt-pkg/pkgcachegen.cc:156 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" --#: apt-pkg/pkgcachegen.cc:184 ++#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "處理『%s』時發生錯誤 (NewVersion1)。" --#: apt-pkg/pkgcachegen.cc:188 ++#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "處理『%s』時發生錯誤 (UsePackage3)。" --#: apt-pkg/pkgcachegen.cc:192 ++#: apt-pkg/pkgcachegen.cc:194 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "處理『%s』時發生錯誤 (NewVersion2)。" --#: apt-pkg/pkgcachegen.cc:207 ++#: apt-pkg/pkgcachegen.cc:209 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "套件數量超過本程式的能力。" --#: apt-pkg/pkgcachegen.cc:210 ++#: apt-pkg/pkgcachegen.cc:212 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "套件版本數量超過本程式的能力。" --#: apt-pkg/pkgcachegen.cc:213 ++#: apt-pkg/pkgcachegen.cc:215 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "依存關係數量超過本程式的能力。" --#: apt-pkg/pkgcachegen.cc:241 ++#: apt-pkg/pkgcachegen.cc:243 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "處理『%s』時發生錯誤 (FindPkg)。" --#: apt-pkg/pkgcachegen.cc:254 ++#: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。" --#: apt-pkg/pkgcachegen.cc:260 ++#: apt-pkg/pkgcachegen.cc:262 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "當計算相依性時找不到套件 %s %s " --#: apt-pkg/pkgcachegen.cc:574 ++#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Couldn't stat source package list %s" msgstr "無法讀取來源檔『%s』的目錄資料。" --#: apt-pkg/pkgcachegen.cc:658 ++#: apt-pkg/pkgcachegen.cc:660 msgid "Collecting File Provides" msgstr "收集檔案供應" --#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 ++#: apt-pkg/pkgcachegen.cc:787 apt-pkg/pkgcachegen.cc:794 msgid "IO Error saving source cache" msgstr "無法寫入來源暫存檔。" @@@ -2426,31 -2527,31 +2553,31 @@@ msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%s』更換失敗 (%s → %s)。" - #: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 ++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5 檢查碼不符合。" - #: apt-pkg/acquire-item.cc:714 + #: apt-pkg/acquire-item.cc:722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" - #: apt-pkg/acquire-item.cc:767 -#: apt-pkg/acquire-item.cc:775 ++#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" - #: apt-pkg/acquire-item.cc:803 -#: apt-pkg/acquire-item.cc:811 ++#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。" - #: apt-pkg/acquire-item.cc:890 -#: apt-pkg/acquire-item.cc:898 ++#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "檔案大小不符合。" @@@ -2459,7 -2560,7 +2586,7 @@@ msgid "Vendor block %s contains no fingerprint" msgstr "廠商區段%s有錯誤。" - #: apt-pkg/cdrom.cc:504 + #: apt-pkg/cdrom.cc:507 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@@ -2468,47 -2569,47 +2595,47 @@@ msgstr " "使用光碟機掛載點 %s\n" "掛載光碟機中\n" - #: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 + #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "標識中.." - #: apt-pkg/cdrom.cc:538 + #: apt-pkg/cdrom.cc:541 #, c-format msgid "Stored label: %s \n" msgstr "保存標誌：%s \n" - #: apt-pkg/cdrom.cc:558 + #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "使用光碟機掛載點 %s\n" - #: apt-pkg/cdrom.cc:576 + #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" msgstr "卸載光碟機中\n" - #: apt-pkg/cdrom.cc:580 + #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" msgstr "等待磁碟中...\n" #. Mount the new CDROM - #: apt-pkg/cdrom.cc:588 + #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" msgstr "掛載光碟機中... \n" - #: apt-pkg/cdrom.cc:606 + #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "掃描碟片中的索引檔案..\n" - #: apt-pkg/cdrom.cc:644 + #: apt-pkg/cdrom.cc:647 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n" - #: apt-pkg/cdrom.cc:701 + #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" msgstr "這不是合法名稱，重試一下。\n" - #: apt-pkg/cdrom.cc:717 + #: apt-pkg/cdrom.cc:726 #, c-format msgid "" "This disc is called: \n" @@@ -2517,19 -2618,19 +2644,19 @@@ msgstr " "這個碟片名為：\n" "'%s'\n" - #: apt-pkg/cdrom.cc:721 + #: apt-pkg/cdrom.cc:730 msgid "Copying package lists..." msgstr "複製套件清單中" - #: apt-pkg/cdrom.cc:745 + #: apt-pkg/cdrom.cc:754 msgid "Writing new source list\n" msgstr "寫入新的來源列表中\n" - #: apt-pkg/cdrom.cc:754 + #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" - #: apt-pkg/cdrom.cc:788 + #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." msgstr "卸載光碟機中..." @@@ -2552,3 -2653,57 +2679,57 @@@ msgstr "寫入 %i 筆 %i å€‹ä¸åŒ¹é…æª #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n" + + #: apt-pkg/deb/dpkgpm.cc:358 + #, fuzzy, c-format + msgid "Preparing %s" + msgstr "開啟『%s』中" + + #: apt-pkg/deb/dpkgpm.cc:359 + #, fuzzy, c-format + msgid "Unpacking %s" + msgstr "開啟『%s』中" + + #: apt-pkg/deb/dpkgpm.cc:364 + #, fuzzy, c-format + msgid "Preparing to configure %s" + msgstr "開啟組態檔 %s" + + #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format ++#, c-format + msgid "Configuring %s" -msgstr "聯絡主機『%s』中" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:366 + #, fuzzy, c-format + msgid "Installed %s" + msgstr "已安裝:" + + #: apt-pkg/deb/dpkgpm.cc:371 + #, c-format + msgid "Preparing for removal of %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:372 + #, fuzzy, c-format + msgid "Removing %s" + msgstr "開啟『%s』中" + + #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format ++#, c-format + msgid "Removed %s" -msgstr "推薦" ++msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:378 + #, c-format + msgid "Preparing for remove with config %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:379 + #, c-format + msgid "Removed with config %s" + msgstr "" + + #: methods/rsh.cc:330 + msgid "Connection closed prematurely" + msgstr "連線不預期的結束"