From: Michael Vogt Date: Mon, 9 Jul 2007 16:26:23 +0000 (+0100) Subject: * merged apt--mvo X-Git-Tag: 0.7.24ubuntu1~170 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/89b52526ec245cacdbac1b4aee6c877dc9a410e4?hp=-c * merged apt--mvo * reverted b-d changes * make upate-po --- 89b52526ec245cacdbac1b4aee6c877dc9a410e4 diff --combined apt-pkg/depcache.cc index ca9636cc1,7f5719454..769bd072e --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@@ -216,7 -216,6 +216,6 @@@ bool pkgDepCache::writeStateFile(OpProg pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); if(pkg.end() || pkg.VersionList().end()) continue; - bool oldAuto = section.FindI("Auto-Installed"); bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "Update exisiting AutoInstall info: " @@@ -1286,6 -1285,7 +1285,7 @@@ void pkgDepCache::MarkPackage(const pkg bool follow_suggests) { pkgDepCache::StateCache &state = PkgState[pkg->ID]; + VerIterator currver = pkg.CurrentVer(); VerIterator candver = state.CandidateVerIter(*this); VerIterator instver = state.InstVerIter(*this); @@@ -1306,9 -1306,11 +1306,11 @@@ } #endif - // Ignore versions other than the InstVer, and ignore packages - // that are already going to be removed or just left uninstalled. - if(!(ver == instver && !instver.end())) + // For packages that are not going to be removed, ignore versions + // other than the InstVer. For packages that are going to be + // removed, ignore versions other than the current version. + if(!(ver == instver && !instver.end()) && + !(ver == currver && instver.end() && !ver.end())) return; // if we are marked already we are done @@@ -1378,4 -1380,3 +1380,4 @@@ bool pkgDepCache::Sweep( return true; } + diff --combined apt-pkg/pkgrecords.cc index d251bee41,e506de73a..a5dab22ff --- a/apt-pkg/pkgrecords.cc +++ b/apt-pkg/pkgrecords.cc @@@ -20,23 -20,23 +20,23 @@@ // Records::pkgRecords - Constructor /*{{{*/ // --------------------------------------------------------------------- /* This will create the necessary structures to access the status files */ - pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), + pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(Cache.HeaderP->PackageFileCount) { - for (pkgCache::PkgFileIterator I = Cache.FileBegin(); - I.end() == false; I++) + for (pkgCache::PkgFileIterator I = Cache.FileBegin(); + I.end() == false; I++) { const pkgIndexFile::Type *Type = pkgIndexFile::Type::GetType(I.IndexType()); if (Type == 0) { - _error->Error(_("Index file type '%s' is not supported"),I.IndexType()); - return; + _error->Error(_("Index file type '%s' is not supported"),I.IndexType()); + return; } Files[I->ID] = Type->CreatePkgParser(I); if (Files[I->ID] == 0) - return; - } + return; + } } /*}}}*/ // Records::~pkgRecords - Destructor /*{{{*/ @@@ -50,7 -50,6 +50,6 @@@ pkgRecords::~pkgRecords( { delete *it; } - } /*}}}*/ // Records::Lookup - Get a parser for the package version file /*{{{*/ diff --combined cmdline/apt-get.cc index 5a6369476,aa54677be..aaa419855 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@@ -1519,6 -1519,7 +1519,7 @@@ bool TryInstallTask(pkgDepCache &Cache // build regexp for the task char S[300]; + // better: "^Task:.*[^a-z]lamp-server([^a-z]|\n)" ? snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*$", taskname); regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); @@@ -2114,36 -2115,6 +2115,36 @@@ bool DoSource(CommandLine &CmdL if (Last == 0) return _error->Error(_("Unable to find a source package for %s"),Src.c_str()); + string srec = Last->AsStr(); + string::size_type pos = srec.find("\nVcs-"); + while (pos != string::npos) + { + pos += strlen("\nVcs-"); + string vcs = srec.substr(pos,srec.find(":",pos)-pos); + if(vcs == "Browser") + { + pos = srec.find("\nVcs-", pos); + continue; + } + pos += vcs.length()+2; + string::size_type epos = srec.find("\n", pos); + string uri = srec.substr(pos,epos-pos).c_str(); + ioprintf(c1out, _("WARNING: '%s' is maintained in " + "the '%s' version control system at:\n" + "%s\n"), + Src.c_str(), vcs.c_str(), uri.c_str()); + if(vcs == "Bzr") + ioprintf(c1out,_("Please use:\n" + "bzr get %s\n" + "to modify the package.\n"), + uri.c_str()); + ioprintf(c1out, "Are you sure you want to continue [yN]? "); + if(!YnPrompt(false)) + return _error->Error(_("Abort.")); + else + break; + } + // Back track vector Lst; if (Last->Files(Lst) == false) diff --combined configure.in index ef05ca0cb,4daa0ab78..b5a4a6c29 --- 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.7.2ubuntu6") -AC_DEFINE_UNQUOTED(VERSION,"0.7.2-0.1") ++AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu7") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --combined debian/changelog index 8b78201aa,cb86ce580..cefcef4ae --- a/debian/changelog +++ b/debian/changelog @@@ -1,85 -1,40 +1,95 @@@ -apt (0.7.4) UNRELEASED; urgency=low +apt (0.7.2ubuntu7) gutsy; urgency=low - * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) + * fix build-dependencies ++ * fixes in the auto-mark code (thanks to Daniel ++ Burrows) + - -- ++ -- Michael Vogt Mon, 9 Jul 2007 19:02:54 +0200 + +apt (0.7.2ubuntu6) gutsy; urgency=low + + [ Michael Vogt] + * cmdline/apt-get.cc: + - make the XS-Vcs-$foo warning more copy'n'paste + friendly (thanks to Matt Zimmerman) + - ignore the Vcs-Browser tag (Fixes LP: #121770) + * debian/apt.conf.autoremove: + - added "linux-ubuntu-modules" to APT::NeverAutoRemove + + [ Sarah Hobbs ] + * Change metapackages to *metapackages in Install-Recommends-Section + and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that + the Recommends of metapackages in universe and multiverse will get + installed. + * Also make this change in doc/examples/configure-index. + * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto, + docbook to fix FTBFS. + * Added in previous changelog entries, as those who uploaded did not + actually commit to Bzr. + + -- Sarah Hobbs Mon, 09 Jul 2007 01:15:57 +1000 + +pt (0.7.2ubuntu5) gutsy; urgency=low + + * Rerun autoconf to fix the FTBFS. + + -- Michael Bienia Fri, 06 Jul 2007 19:17:33 +0200 + +apt (0.7.2ubuntu4) gutsy; urgency=low + + * Rebuild for the libcurl4 -> libcurl3 transition mess. + + -- Steve Kowalik Fri, 6 Jul 2007 12:44:05 +1000 + +apt (0.7.2ubuntu3) gutsy; urgency=low + + * cmdline/apt-get.cc: + - fix InstallTask code when a pkgRecord ends + with a single '\n' (thanks to Soren Hansen for reporting) - -- Otavio Salvador Mon, 02 Jul 2007 13:27:54 -0300 + -- Michael Vogt Wed, 27 Jun 2007 13:33:38 +0200 -apt (0.7.3) unstable; urgency=low +apt (0.7.2ubuntu2) gutsy; urgency=low - * fixed compile errors with g++ 7.3 (thanks to + * fixed compile errors with g++ 4.3 (thanks to Daniel Burrows, closes: #429378) - * fixes in the auto-mark code (thanks to Daniel - Burrows) * fix FTFBFS by changing build-depends to libcurl4-gnutls-dev (closes: #428363) - * cmdline/apt-get.cc: - - fix InstallTask code when a pkgRecord ends - with a single '\n' (thanks to Soren Hansen for reporting) - * merged from Christian Perrier: - * vi.po: completed to 532t, again. Closes: #429899 - * gl.po: completed to 532t. Closes: #429506 - * vi.po: completed to 532t. Closes: #428672 - * Update all PO and the POT. Gives 514t14f4u for formerly - complete translations - * fr.po: completed to 532t - * ku.po, uk.po, LINGUAS: reintegrate those translations - which disappeared from the BZR repositories - -- Michael Vogt Sun, 01 Jul 2007 12:31:29 +0200 + -- Michael Vogt Tue, 19 Jun 2007 13:47:03 +0200 + +apt (0.7.2ubuntu1) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - apport integration added, this means that a apport + report is written on dpkg failures + * cmdline/apt-get.cc: + - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/ + this will warn when Vcs- headers are found on apt-get source + (Fixes LP:#115959) + * merged from debian/unstable, remaining changes: + - maintainer field changed + - merged the apt--mirror branch + http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/ + - apport reporting on package install/upgrade/remove failure + - support for "Originial-Maintainer" field + - merged apt--xs-vcs-bzr branch + (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/) + - use ubuntu archive keyring by default + - debian/apt.conf.autoremove + + install recommands for section "metapackages" + + do not mark direct dependencies of "metapackages" as autoremoved + + -- Michael Vogt Thu, 14 Jun 2007 10:38:36 +0200 + apt (0.7.2-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Build-depend on libcurl4-gnutls-dev instead of the obsolete + libcurl3-gnutls-dev. Closes: #428363. + + -- Steve Langasek Thu, 28 Jun 2007 18:46:53 -0700 + apt (0.7.2) unstable; urgency=low * merged the debian/experimental changes back @@@ -138,16 -93,12 +148,16 @@@ apt (0.7.1) experimental; urgency=lo * methods/cdrom.cc: - only umount if it was mounted by the method before * po/gl.po: - - fix error translation that causes trouble to lsb_release + - fix error in translation that causes trouble to lsb_release + (LP#79165) * apt-pkg/acquire-item.cc: - if decompression of a index fails, delete the index * apt-pkg/acquire.{cc,h}: - deal better with duplicated sources.list entries (avoid double queuing of URLs) - this fixes hangs in bzip/gzip + (LP#102511) + * Fix broken use of awk in apt-key that caused removal of the wrong keys + from the keyring. Closes: #412572 * merged from Christian Perrier: * mr.po: New Marathi translation Closes: #416806 * zh_CN.po: Updated by Eric Pareja Closes: #416822 @@@ -169,94 -120,7 +179,94 @@@ * apt-pkg/policy.cc: - allow multiple packages (thanks to David Foerster) - -- Michael Vogt Wed, 2 May 2007 13:43:44 +0200 + -- Michael Vogt Tue, 17 Apr 2007 15:53:37 +0200 + +apt (0.6.46.4ubuntu10) feisty; urgency=low + + * apt-pkg/depcache.cc: + - added "APT::Never-MarkAuto-Section" and consider dependencies + of packages in this section manual (LP#59893) + - ensure proper permissions in the extended_state file (LP#67037) + * debian/apt.conf.ubuntu: + - added APT::Never-MarkAuto-Section "metapackages" (LP#59893) + * cmdline/apt-get.cc: + - "apt-get install foo" on a already installed package foo will + clean the automatic installed flag (LP#72007) + - do not show packages already marked for removal as auto-installed + (LP#64493) + - applied patch to (optionally) hide the auto-remove information + (thanks to Frode M. Døving) (LP#69148) + + -- Michael Vogt Wed, 14 Mar 2007 13:32:32 +0100 + +apt (0.6.46.4ubuntu9) feisty; urgency=low + + * debian/control: + - set XS-Vcs-Bzr header + - Set Ubuntu maintainer address + * apt-pkg/cdrom.cc: + - only unmount if APT::CDROM::NoMount is false + - only umount if it was mounted by the method before + * cmdline/apt-get.cc: + - fix version output in autoremove list (LP#68941) + * apt-pkg/packagemanager.cc: + - do not spin 100% cpu in FixMissing() (LP#84476) + * apt-pkg/indexfile.cc: + - fix problem overwriting APT::Acquire::Translation + * doc/examples/configure-index: + - document APT::Acquire::Translation + + -- Michael Vogt Tue, 13 Mar 2007 15:24:39 +0100 + +apt (0.6.46.4ubuntu8) feisty; urgency=low + + * fix segfault in the pkgRecords destructor + * Bump ABI version + * debian/control: + - make the libcurl3-gnutls-dev versionized (LP#86614) + + -- Michael Vogt Mon, 26 Feb 2007 14:26:33 +0100 + +apt (0.6.46.4ubuntu7) feisty; urgency=low + + * Merged the apt--mirror branch. This means that a new 'mirror' + method is available that will allow dynamic mirror updates. + The sources.list entry looks something like this: + "deb mirror://mirrors.lp.net/get_mirror feisty main restricted" + + It also supports error reporting to a configurable url for mirror + problems/failures. + * Bump ABI version + + -- Michael Vogt Tue, 6 Feb 2007 11:38:06 +0100 + +apt (0.6.46.4ubuntu6) feisty; urgency=low + + * methods/http.cc: + - send apt version in User-Agent + * apt-pkg/deb/debrecords.cc: + - fix SHA1Hash() return value + * apt-pkg/algorithms.cc: + - fix resolver bug on removal triggered by weak-dependencies + with or-groups + - fix segfault (lp: #76530) + + -- Michael Vogt Wed, 20 Dec 2006 11:04:36 +0100 + +apt (0.6.46.4ubuntu5) feisty; urgency=low + + * added apt-transport-https package to provide a optional + https transport (apt-https spec) + + -- Michael Vogt Tue, 19 Dec 2006 16:23:43 +0100 + +apt (0.6.46.4ubuntu4) feisty; urgency=low + + * apt-pkg/algorithms.cc: + - only increase the score of installed applications if they + are not obsolete + + -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 apt (0.7.0) experimental; urgency=low @@@ -275,29 -139,6 +285,29 @@@ -- Michael Vogt Fri, 12 Jan 2007 20:48:07 +0100 +apt (0.6.46.4ubuntu3) feisty; urgency=low + + * apt-pkg/algorithm.cc: + - use clog for all debugging + * apt-pkg/depcache.cc: + - never mark Required package for autoremoval (lp: #75882) + + -- Michael Vogt Mon, 18 Dec 2006 11:56:05 +0100 + +apt (0.6.46.4ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + (thanks to Ian Jackson) + + -- Michael Vogt Thu, 7 Dec 2006 23:07:24 +0100 + +apt (0.6.46.4ubuntu1) feisty; urgency=low + + * merged with debian + + -- Michael Vogt Thu, 7 Dec 2006 12:13:14 +0100 + apt (0.6.46.4-0.1) unstable; urgency=emergency * NMU @@@ -344,26 -185,6 +354,26 @@@ apt (0.6.46.3-0.1) unstable; urgency=hi -- Andreas Barth Tue, 5 Dec 2006 10:34:56 +0000 +apt (0.6.46.3ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + + -- Ian Jackson Thu, 7 Dec 2006 15:46:52 +0000 + +apt (0.6.46.3ubuntu1) feisty; urgency=low + + * doc/apt-get.8.xml: + - documented autoremove, thanks to Vladimír Lapá%Gč%@ek + (lp: #62919) + * fix broken i18n in the dpkg progress reporting, thanks to + Frans Pop and Steinar Gunderson. (closes: #389261) + * po/en_GB.po: + - typo (lp: #61270) + * add apt-secure.8 to "See also" section + + -- Michael Vogt Thu, 23 Nov 2006 07:24:12 +0100 + apt (0.6.46.3) unstable; urgency=low * apt-pkg/deb/dpkgpm.cc: @@@ -438,46 -259,10 +448,46 @@@ apt (0.6.46) unstable; urgency=lo * debian/control: - switched to libdb4.4 for building (closes: #381019) * cmdline/apt-get.cc: - - show only the recommends/suggests for the candidate-version, not for all - versions of the package (closes: #257054) - - properly handle recommends/suggests or-groups when printing the list of - suggested/recommends packages (closes: #311619) + - fix in the TryInstallTask() code to make sure that all package + there are marked manual install (lp: #61684) + + -- Michael Vogt Thu, 28 Sep 2006 00:34:20 +0200 + +apt (0.6.45ubuntu14) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the TryInstallTask() code to make sure that all package + there are marked manual install (lp: #61684) + + -- Michael Vogt Thu, 28 Sep 2006 00:34:20 +0200 + +apt (0.6.45ubuntu13) edgy; urgency=low + + * no-changes upload to make apt rebuild against latest g++ and + fix synaptic FTBFS (see bug: #62461 for details) + + -- Michael Vogt Tue, 26 Sep 2006 22:33:10 +0200 + +apt (0.6.45ubuntu12) edgy; urgency=low + + * apt-pkg/depcache.cc: + - fix in the sweep() code, set garbage flag for packages scheduled + for removal too + - do not change the autoFlag in MarkKeep(), this can lead to suprising + side effects + + -- Michael Vogt Thu, 21 Sep 2006 00:58:24 +0200 + +apt (0.6.45ubuntu11) edgy; urgency=low + + * removed "installtask" and change it so that tasknames can be given + with "apt-get install taskname^" + * improve the writeStateFile() code + + -- Michael Vogt Wed, 20 Sep 2006 14:14:24 +0200 + +apt (0.6.45ubuntu10) edgy; urgency=low + * methods/http.cc: - check more careful for incorrect proxy settings (closes: #378868) * methods/gzip.cc: @@@ -502,113 -287,8 +512,113 @@@ caseinsensitive (closes: #384182) - reverted MMap use in the tagfile because it does not work across pipes (closes: #383487) + * added "installtask" command + * added new ubuntu specific rewrite rule for "Original-Maintainer" - -- Michael Vogt Thu, 21 Sep 2006 10:25:03 +0200 + -- Michael Vogt Tue, 19 Sep 2006 15:07:51 +0200 + +apt (0.6.45ubuntu9) edgy; urgency=low + + * cmdline/apt-get.cc: + - if --no-remove is given, do not run the AutoRemove code + + -- Michael Vogt Wed, 13 Sep 2006 11:54:20 +0200 + +apt (0.6.45ubuntu8) edgy; urgency=low + + * apt-pkg/algorithm.cc: + - fix pkgProblemResolver.InstallProtect() to preserve the auto-install + information (lp: #59457) + * cmdline/apt-get.cc: + - fix typo in autoremove information (lp: #59420) + * install apt-mark to modify the automatically install information for + packages + + -- Michael Vogt Fri, 8 Sep 2006 20:07:22 +0200 + +apt (0.6.45ubuntu7) edgy; urgency=low + + * apt-pkg/depcache.cc: + - fix a bug in the install-recommends-section code + + -- Michael Vogt Thu, 7 Sep 2006 18:22:38 +0200 + +apt (0.6.45ubuntu6) edgy; urgency=low + + [Michael Vogt] + * cmdline/apt-get.cc: + - always show auto-removable packages and give a hint how to remove + them + * debian/apt.conf.ubuntu: + - exlucde linux-image and linux-restricted-modules from ever being + auto-removed + - added "metapackages" as the section we want to install recommends + by default + * apt-pkg/depcache.cc: + - added support to turn install-recommends selectively on/off by + section + [Ian Jackson] + * Tests pass without code changes! Except that we need this: + * Bump cache file major version to force rebuild so that Breaks + dependencies are included. + * Don't depend on or suggest any particular dpkg or dpkg-dev versions; + --auto-deconfigure is very very old and dpkg-dev's Breaks support + is more or less orthogonal. + * Initial draft of `Breaks' implementation. Appears to compile, + but as yet *completely untested*. + + -- Michael Vogt Thu, 7 Sep 2006 11:50:52 +0200 + +apt (0.6.45ubuntu5) edgy; urgency=low + + * apt-pkg/pkgcachegen.cc: + - increase the APT::Cache-Limit to deal with the increased demand due + to the translated descriptions + * apt-pkg/deb/dpkgpm.cc: + - pass "--auto-deconfigure" to dpkg on install to support the + new "breaks" in dpkg + + -- Michael Vogt Tue, 15 Aug 2006 12:06:26 +0200 + +apt (0.6.45ubuntu4) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the new --fix-polciy code + + -- Michael Vogt Mon, 14 Aug 2006 21:08:11 +0200 + +apt (0.6.45ubuntu3) edgy; urgency=low + + * ABI break + * merged latest apt--install-recommends (closes: #559000) + * added "--fix-policy" option to can be used as "--fix-broken" and + will install missing weak depends (recommends, and/or suggests + depending on the settings) + * merged the apt--ddtp branch + + -- Michael Vogt Fri, 11 Aug 2006 12:53:23 +0200 + +apt (0.6.45ubuntu2) edgy; urgency=low + + * debian/control: + - switched to libdb4.4 for building (closes: #381019) + * cmdline/apt-get.cc: + - show only the recommends/suggests for the candidate-version, not for all + versions of the package (closes: #257054) + - properly handle recommends/suggests or-groups when printing the list of + suggested/recommends packages (closes: #311619) + * merged "apt--install-recommends" branch: + - added "{no-}install-recommends" commandline option + - added APT::Install-{Recommends,Suggests} option + - currently Install-Recommends defaults to "False" + + -- Michael Vogt Wed, 9 Aug 2006 23:38:46 +0200 + +apt (0.6.45ubuntu1) edgy; urgency=low + + * merged with debian/unstable + + -- Michael Vogt Tue, 1 Aug 2006 15:43:22 +0200 apt (0.6.45) unstable; urgency=low @@@ -646,57 -326,42 +656,57 @@@ * dz.po: New Dzongkha translation: 512t * ro.po: Updated to 512t * eu.po: Updated - * eu.po: Updated - * fix apt-get dist-upgrade - * fix warning if no /var/lib/apt/extended_states is present - * don't download Translations for deb-src sources.list lines - * apt-pkg/tagfile.cc: - - support not-mmapable files again - -- Michael Vogt Tue, 25 Jul 2006 11:55:22 +0200 + -- Michael Vogt Thu, 27 Jul 2006 00:52:05 +0200 -apt (0.6.44.2exp1) experimental; urgency=low +apt (0.6.44.2ubuntu4) edgy; urgency=low - * added support for i18n of the package descriptions - * added support for aptitude like auto-install tracking (a HUGE - HUGE thanks to Daniel Burrows who made this possible) - * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch - * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental + * Make apt-get dselect-upgrade happy again - -- Michael Vogt Mon, 3 Jul 2006 21:50:31 +0200 + -- Michael Vogt Fri, 21 Jul 2006 11:03:02 +0200 -apt (0.6.44.2) unstable; urgency=low +apt (0.6.44.2ubuntu3) edgy; urgency=low - * apt-pkg/depcache.cc: - - added Debug::pkgDepCache::AutoInstall (thanks to infinity) - * apt-pkg/acquire-item.cc: - - fix missing chmod() in the new aquire code - (thanks to Bastian Blank, Closes: #367425) - * merged from - http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: - * sk.po: Completed to 512t - * eu.po: Completed to 512t - * fr.po: Completed to 512t - * sv.po: Completed to 512t - * Update all PO and the POT. Gives 506t6f for formerly - complete translations + * Close extended_states file after writing it. - -- Michael Vogt Wed, 14 Jun 2006 12:00:57 +0200 + -- Colin Watson Tue, 18 Jul 2006 00:12:13 +0100 + +apt (0.6.44.2ubuntu2) edgy; urgency=low + + * create a empty extended_states file if none exists already + + -- Michael Vogt Tue, 4 Jul 2006 09:23:03 +0200 + +apt (0.6.44.2ubuntu1) edgy; urgency=low + + * merged with debian/unstable + * merged the "auto-mark" branch to support aptitude like + marking of automatically installed dependencies and added + "apt-get remove --auto-remove" to remove unused auto-installed + packages again + * changed library version from 3.11 to 3.50 to make it clearly + different from the debian version (we are ABI incompatible because + of the auto-mark patch) + + -- Michael Vogt Mon, 3 Jul 2006 18:30:46 +0200 + +apt (0.6.44.2) unstable; urgency=low + + * apt-pkg/depcache.cc: + - added Debug::pkgDepCache::AutoInstall (thanks to infinity) + * apt-pkg/acquire-item.cc: + - fix missing chmod() in the new aquire code + (thanks to Bastian Blank, Closes: #367425) + * merged from + http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + * sk.po: Completed to 512t + * eu.po: Completed to 512t + * fr.po: Completed to 512t + * sv.po: Completed to 512t + * Update all PO and the POT. Gives 506t6f for formerly + complete translations + + -- Michael Vogt Wed, 14 Jun 2006 12:00:57 +0200 apt (0.6.44.1-0.1) unstable; urgency=low @@@ -758,26 -423,6 +768,26 @@@ apt (0.6.44) unstable; urgency=lo -- Michael Vogt Mon, 8 May 2006 22:28:53 +0200 +apt (0.6.43.3ubuntu3) dapper; urgency=low + + * methods/http.cc: + - fix the user-agent string + + -- Michael Vogt Fri, 26 May 2006 18:09:32 +0200 + +apt (0.6.43.3ubuntu2) dapper; urgency=low + + * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) + + -- Michael Vogt Tue, 18 Apr 2006 13:24:40 +0200 + +apt (0.6.43.3ubuntu1) dapper; urgency=low + + * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in + the status-fd (ubuntu #28954) + + -- Michael Vogt Tue, 28 Mar 2006 20:34:46 +0200 + apt (0.6.43.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: @@@ -787,46 -432,16 +797,46 @@@ * pl.po: Completed to 512t. Closes: #349514 * sk.po: Completed to 512t. Closes: #349474 * gl.po: Completed to 512 strings Closes: #349407 + * vi.po: Completed to 512 strings * sv.po: Completed to 512 strings Closes: #349210 * ru.po: Completed to 512 strings Closes: #349154 * da.po: Completed to 512 strings Closes: #349084 * fr.po: Completed to 512 strings + * LINGUAS: Add Welsh + * *.po: Updated from sources (512 strings) * vi.po: Completed to 511 strings Closes: #348968 - * zh_CN.po: Completed to 512t. Closes: #353936 - * it.po: Completed to 512t. Closes: #352803 - * pt_BR.po: Completed to 512t. Closes: #352419 + * apt-pkg/deb/deblistparser.cc: + - don't explode on a DepCompareOp in a Provides line, but warn about + it and ignore it otherwise (thanks to James Troup for reporting it) + * cmdline/apt-get.cc: + - don't lock the lists directory in DoInstall, breaks --print-uri + (thanks to James Troup for reporting it) + * debian/apt.dirs: create /etc/apt/sources.list.d + * make apt-cache madison work without deb-src entries (#352583) + * cmdline/apt-get.cc: only run the list-cleaner if a update was + successfull + * apt-get update errors are only warnings nowdays + * be more careful with the signature file on network failures + + -- Michael Vogt Wed, 22 Feb 2006 10:13:04 +0100 + +apt (0.6.43.2ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182: + * ca.po: Completed to 512t. Closes: #351592 + * eu.po: Completed to 512t. Closes: #350483 + * ja.po: Completed to 512t. Closes: #349806 + * pl.po: Completed to 512t. Closes: #349514 + * sk.po: Completed to 512t. Closes: #349474 + * gl.po: Completed to 512 strings Closes: #349407 + * vi.po: Completed to 512 strings + * sv.po: Completed to 512 strings Closes: #349210 + * ru.po: Completed to 512 strings Closes: #349154 + * da.po: Completed to 512 strings Closes: #349084 + * fr.po: Completed to 512 strings * LINGUAS: Add Welsh * *.po: Updated from sources (512 strings) + * vi.po: Completed to 511 strings Closes: #348968 * apt-pkg/deb/deblistparser.cc: - don't explode on a DepCompareOp in a Provides line, but warn about it and ignore it otherwise (thanks to James Troup for reporting it) @@@ -837,10 -452,8 +847,10 @@@ * make apt-cache madison work without deb-src entries (#352583) * cmdline/apt-get.cc: only run the list-cleaner if a update was successfull + * apt-get update errors are only warnings nowdays + * be more careful with the signature file on network failures - -- Michael Vogt Wed, 22 Feb 2006 10:13:04 +0100 + -- Michael Vogt Mon, 20 Feb 2006 22:27:48 +0100 apt (0.6.43.2) unstable; urgency=low @@@ -865,26 -478,8 +875,26 @@@ -- Michael Vogt Thu, 19 Jan 2006 00:06:33 +0100 -apt (0.6.43.1) unstable; urgency=low +apt (0.6.43.1ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159: + - en_GB.po, de.po: fix spaces errors in "Ign " translations + Closes: #347258 + - makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + - sv.po: Completed to 511t. Closes: #346450 + - sk.po: Completed to 511t. Closes: #346369 + - fr.po: Completed to 511t + - *.po: Updated from sources (511 strings) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) + * added APT::Periodic::Unattended-Upgrade (requires the package + "unattended-upgrade") + + -- Michael Vogt Tue, 10 Jan 2006 17:09:31 +0100 +apt (0.6.43.1) unstable; urgency=low + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: * fr.po: Completed to 510 strings * it.po: Completed to 510t @@@ -906,19 -501,6 +916,19 @@@ -- Michael Vogt Fri, 6 Jan 2006 01:17:08 +0100 +apt (0.6.43ubuntu2) dapper; urgency=low + + * merged some missing bits that wheren't merged by baz in the previous + upload (*grumble*) + + -- Michael Vogt Thu, 8 Dec 2005 18:35:58 +0100 + +apt (0.6.43ubuntu1) dapper; urgency=low + + * merged with debian + + -- Michael Vogt Fri, 25 Nov 2005 11:36:29 +0100 + apt (0.6.43) unstable; urgency=medium * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: @@@ -939,22 -521,6 +949,22 @@@ -- Michael Vogt Tue, 29 Nov 2005 00:17:07 +0100 +apt (0.6.42.3ubuntu2) dapper; 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 Mon, 14 Nov 2005 15:30:12 +0100 + +apt (0.6.42.3ubuntu1) dapper; urgency=low + + * synced with debian + + -- Michael Vogt Thu, 10 Nov 2005 05:05:56 +0100 + apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: @@@ -1002,13 -568,13 +1012,13 @@@ apt (0.6.42) unstable; urgency=lo - 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 + * 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-112: Swedish translation update - patch-115: Basque translation completed (Closes: #333299) * applied french man-page update (thanks to Philippe Batailler) (closes: #316638, #327456) @@@ -1022,9 -588,9 +1032,9 @@@ * 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 + * init the default ScreenWidth to 79 columns by default (Closes: #324921) - * cmdline/apt-cdrom.cc: + * cmdline/apt-cdrom.cc: - fix some missing gettext() calls (closes: #334539) * doc/apt-cache.8.xml: fix typo (closes: #334714) @@@ -1035,8 -601,8 +1045,8 @@@ apt (0.6.41) unstable; urgency=lo * 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 - * improved the network timeout handling, if a index file from a - sources.list times out or EAI_AGAIN is returned from getaddrinfo, + * 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 @@@ -1044,10 -610,10 +1054,10 @@@ * 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 + argument to apt-key which was previously not documented (Closes: #322120) * Andreas Pakulat: - - added example apt-ftparchive.conf file to doc/examples + - 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) @@@ -1056,84 -622,10 +1066,84 @@@ * 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() + * Reread status configuration on debSystem::Initialize() (needed for apt-proxy, thanks to Otavio for this patch) - + -- Michael Vogt Mon, 5 Sep 2005 22:59:03 +0200 + +apt (0.6.40.1ubuntu8) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62: + - fix for a bad memory/file leak in the mmap code (ubuntu #15603) + * po/de.po, po/fr.po: + - updated the translations + * po/makefile: + - create a single pot file in each domain dir to make rosetta happy + + -- Michael Vogt Wed, 28 Sep 2005 10:16:06 +0200 + +apt (0.6.40.1ubuntu7) breezy; urgency=low + + * updated the pot/po files , no code changes + + -- Michael Vogt Tue, 27 Sep 2005 18:38:16 +0200 + +apt (0.6.40.1ubuntu6) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56: + - make it possible for apt to handle a failed MediaChange event and + fall back to other sources (ubuntu #13713) + + -- Michael Vogt Tue, 13 Sep 2005 22:09:50 +0200 + +apt (0.6.40.1ubuntu5) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}. + This adds media-change reporting to the apt status-fd (ubuntu #15213) + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55: + apt-pkg/cdrom.cc: + - unmount the cdrom when apt failed to locate any package files + + -- Michael Vogt Mon, 12 Sep 2005 15:44:26 +0200 + +apt (0.6.40.1ubuntu4) breezy; urgency=low + + * debian/apt.cron.daily: + - fix a embarrassing typo + + -- Michael Vogt Wed, 7 Sep 2005 10:10:37 +0200 + +apt (0.6.40.1ubuntu3) breezy; urgency=low + + * debian/apt.cron.daily: + - use the ctime as well when figuring what packages need to + be removed. This fixes the problem that packages copied with + "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504) + + -- Michael Vogt Tue, 6 Sep 2005 18:30:46 +0200 + +apt (0.6.40.1ubuntu2) breezy; 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 + * 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) + * methods/connect.cc: + - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item + * apt-pkg/acquire-item.cc: + - fail early if a FailReason is TmpResolveFailure (avoids hangs during + the install when no network is available) + * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0 + + -- Michael Vogt Tue, 23 Aug 2005 19:44:55 +0200 + +apt (0.6.40.1ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Michael Vogt Fri, 5 Aug 2005 14:20:56 +0200 apt (0.6.40.1) unstable; urgency=low @@@ -1144,12 -636,6 +1154,12 @@@ -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 +apt (0.6.40ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Matt Zimmerman Thu, 4 Aug 2005 15:53:22 -0700 + apt (0.6.40) unstable; urgency=low * Patch from Jordi Mallach to mark some additional strings for translation @@@ -1165,39 -651,6 +1175,39 @@@ -- Matt Zimmerman Thu, 28 Jul 2005 11:57:32 -0700 +apt (0.6.39ubuntu4) breezy; urgency=low + + * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this + before...) + + -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 + +apt (0.6.39ubuntu3) breezy; urgency=low + + * Fix keyring locations for Ubuntu in apt-key too. + + -- Colin Watson Wed, 29 Jun 2005 14:45:36 +0100 + +apt (0.6.39ubuntu2) breezy; urgency=low + + * Install ubuntu-archive.gpg rather than debian-archive.gpg as + /etc/apt/trusted.gpg. + + -- Colin Watson Wed, 29 Jun 2005 11:53:34 +0100 + +apt (0.6.39ubuntu1) breezy; urgency=low + + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line + + -- Matt Zimmerman Tue, 28 Jun 2005 11:52:24 -0700 + apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@@ -1208,14 -661,7 +1218,14 @@@ * Update priority of apt-utils to important, to match the override file * Install only one keyring on each branch (Closes: #316119) - -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 + -- Matt Zimmerman Tue, 28 Jun 2005 11:35:21 -0700 + +apt (0.6.38ubuntu1) breezy; urgency=low + + * First release from Ubuntu branch + * Merge with --main--0, switch back to Ubuntu keyring + + -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 apt (0.6.38) unstable; urgency=low diff --combined po/apt-all.pot index 9bf93eb54,cccd4b75a..436cf7999 --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 22:26+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -156,7 -156,7 +156,7 @@@ msgstr " #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@@ -554,7 -554,7 +554,7 @@@ msgstr " msgid "Y" msgstr "" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "" @@@ -713,11 -713,11 +713,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "" @@@ -746,7 -746,7 +746,7 @@@ msgstr " msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@@ -772,7 -772,7 +772,7 @@@ msgid " " ?] " msgstr "" - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "" @@@ -780,7 -780,7 +780,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "" - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@@ -789,7 -789,7 +789,7 @@@ msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "" @@@ -915,7 -915,7 +915,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "" @@@ -927,37 -927,37 +927,37 @@@ msgstr " msgid "Internal error, AllUpgrade broke stuff" msgstr "" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, c-format msgid "Couldn't find task %s" msgstr "" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, c-format msgid "%s set to manual installed.\n" msgstr "" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -965,174 -965,159 +965,174 @@@ "or been moved out of Incoming." msgstr "" --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, 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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1386,9 -1371,9 +1386,9 @@@ msgstr " msgid "File %s/%s overwrites the one in the package %s" msgstr "" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "" @@@ -1680,7 -1665,7 +1680,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@@ -1707,39 -1692,39 +1707,39 @@@ msgstr " msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" @@@ -1811,76 -1796,76 +1811,76 @@@ msgstr " msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "" @@@ -1898,57 -1883,57 +1898,57 @@@ msgstr " msgid "Selection %s not found" msgstr "" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "" --#: apt-pkg/contrib/configuration.cc:509 ++#: apt-pkg/contrib/configuration.cc:510 #, c-format --msgid "Line %d too long (max %d)" ++msgid "Line %d too long (max %lu)" msgstr "" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@@ -2015,7 -2000,6 +2015,7 @@@ msgid "Unable to stat the mount point % msgstr "" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "" @@@ -2258,7 -2242,7 +2258,7 @@@ msgid " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" @@@ -2371,7 -2355,7 +2371,7 @@@ msgstr " #: apt-pkg/pkgcachegen.cc:153 #, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" #: apt-pkg/pkgcachegen.cc:178 @@@ -2401,7 -2385,7 +2401,7 @@@ msgstr " #: apt-pkg/pkgcachegen.cc:245 #, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" #: apt-pkg/pkgcachegen.cc:251 @@@ -2448,41 -2432,41 +2448,41 @@@ msgstr " msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, 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:1278 +#: apt-pkg/acquire-item.cc:1329 #, 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:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "" @@@ -2588,52 -2572,52 +2588,52 @@@ msgstr " msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "" diff --combined po/bg.po index ada661c76,cbf1a2a65..dcc5a052e --- a/po/bg.po +++ b/po/bg.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-12 20:14+0300\n" "Last-Translator: Yavor Doganov \n" "Language-Team: Bulgarian \n" @@@ -160,7 -160,7 +160,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -664,7 -664,7 +664,7 @@@ msgstr "Неуспех при преиРmsgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@@ -827,11 -827,11 +827,11 @@@ msgstr "Трябва да бъдат п msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Списъкът с източници не можа да бъде прочетен." @@@ -861,7 -861,7 +861,7 @@@ msgstr "След разпакетира msgid "After unpacking %sB disk space will be freed.\n" msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" @@@ -890,7 -890,7 +890,7 @@@ msgstr " "За да продължите, въведете фразата „%s“\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Прекъсване." @@@ -898,7 -898,7 +898,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" @@@ -907,7 -907,7 +907,7 @@@ msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" @@@ -1041,7 -1041,7 +1041,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" @@@ -1055,31 -1055,31 +1055,31 @@@ msgstr "Вътрешна грешка, msgid "Internal error, AllUpgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Неуспех при намирането на пакет %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Забележете, избиране на %s за регулярен израз „%s“\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "но ще бъде инсталиран %s" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1087,7 -1087,7 +1087,7 @@@ msgstr " "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1099,7 -1099,7 +1099,7 @@@ msgstr " "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1109,133 -1109,118 +1109,133 @@@ msgstr " "да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n" "доклад за грешка за този пакет." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Счупени пакети" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Предложени пакети:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Неуспех" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Готово" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Процесът-потомък пропадна" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1244,7 -1229,7 +1244,7 @@@ msgstr " "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1254,32 -1239,32 +1254,32 @@@ msgstr " "налични версии на пакета %s, които могат да удовлетворят изискването за " "версия" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Поддържани модули:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1589,9 -1574,9 +1589,9 @@@ msgstr "Файловете се замРmsgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s заменя този в пакет %s" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Неуспех при четенето на %s" @@@ -1893,7 -1878,7 +1893,7 @@@ msgstr "Времето за устанРmsgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@@ -1920,39 -1905,39 +1920,39 @@@ msgstr "Запитване msgid "Unable to invoke " msgstr "Неуспех при извикването на " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Свързване с %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Не може да се започне свързване с %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Свързване с %s" @@@ -2032,76 -2017,76 +2032,76 @@@ msgstr "Неуспех при Ð¾Ñ‚Ð²Ð°Ñ msgid "Read error from %s process" msgstr "Грешка при четене от процес %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Чакане на заглавни части" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен е един ред на заглавна част с над %u символа" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Невалиден ред на заглавна част" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Вътрешна грешка" @@@ -2119,59 -2104,59 +2119,59 @@@ msgstr "Неуспех при прехРmsgid "Selection %s not found" msgstr "Изборът %s не е намерен" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестен тип на абревиатура: „%c“" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Отваряне на конфигурационен файл %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Ред %d е твърде дълъг (максимум %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтактична грешка %s:%u: В началото на блока няма име." --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтактична грешка %s:%u: Лошо форматиран таг" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтактична грешка %s:%u: Излишни символи след стойността" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното " "ниво" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" @@@ -2238,7 -2223,6 +2238,7 @@@ msgid "Unable to stat the mount point % msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Неуспех при преминаването в %s" @@@ -2493,7 -2477,7 +2493,7 @@@ msgstr " "пакет %s. Това често е лошо, но ако наистина искате да го направите, " "активирайте опцията APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Не се поддържа индексен файл от типа „%s“" @@@ -2614,7 -2598,7 +2614,7 @@@ msgstr "Възникна грешка Ð #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Възникна грешка при обработката на %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2644,7 -2628,7 +2644,7 @@@ msgstr "Възникна грешка Ð #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Възникна грешка при обработката на %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2696,21 -2680,21 +2696,21 @@@ msgstr "Събиране на Ð¸Ð½Ñ„Ð¾Ñ msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "преименуването се провали, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2719,7 -2703,7 +2719,7 @@@ msgstr " "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2728,14 -2712,14 +2728,14 @@@ msgstr " "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Несъответствие на размера" @@@ -2848,52 -2832,52 +2848,52 @@@ 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Подготвяне на %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Разпакетиране на %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Подготвяне на %s за конфигуриране" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Конфигуриране на %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s е инсталиран" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Подготвяне за премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s е премахнат" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка за пълно премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s е напълно премахнат" diff --combined po/bs.po index 114494b50,10dca043e..56670c498 --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@@ -157,7 -157,7 +157,7 @@@ msgstr " #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@@ -568,7 -568,7 +568,7 @@@ msgstr " msgid "Y" msgstr "" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "" @@@ -729,11 -729,11 +729,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "" @@@ -762,7 -762,7 +762,7 @@@ msgstr " msgid "After unpacking %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@@ -788,7 -788,7 +788,7 @@@ msgid " " ?] " msgstr "" - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Odustani." @@@ -797,7 -797,7 +797,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@@ -806,7 -806,7 +806,7 @@@ msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "" @@@ -933,7 -933,7 +933,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "" @@@ -945,37 -945,37 +945,37 @@@ msgstr " msgid "Internal error, AllUpgrade broke stuff" msgstr "" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, c-format msgid "Couldn't find task %s" msgstr "" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "ali se %s treba instalirati" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -983,174 -983,159 +983,174 @@@ "or been moved out of Incoming." msgstr "" --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "OÅ¡tećeni paketi" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Predloženi paketi:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Preporučeni paketi:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "NeuspjeÅ¡no" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Urađeno" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, 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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Podržani moduli:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1404,9 -1389,9 +1404,9 @@@ msgstr " msgid "File %s/%s overwrites the one in the package %s" msgstr "" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" @@@ -1701,7 -1686,7 +1701,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@@ -1728,39 -1713,39 +1728,39 @@@ msgstr " msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se sa %s" @@@ -1833,76 -1818,76 +1833,76 @@@ msgstr " msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čekam na zaglavlja" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Povezivanje neuspjeÅ¡no" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "UnutraÅ¡nja greÅ¡ka" @@@ -1920,57 -1905,57 +1920,57 @@@ msgstr " msgid "Selection %s not found" msgstr "" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "" --#: apt-pkg/contrib/configuration.cc:509 ++#: apt-pkg/contrib/configuration.cc:510 #, c-format --msgid "Line %d too long (max %d)" ++msgid "Line %d too long (max %lu)" msgstr "" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@@ -2037,7 -2022,6 +2037,7 @@@ msgid "Unable to stat the mount point % msgstr "" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "" @@@ -2282,7 -2266,7 +2282,7 @@@ msgid " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" @@@ -2395,7 -2379,7 +2395,7 @@@ msgstr " #: apt-pkg/pkgcachegen.cc:153 #, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" #: apt-pkg/pkgcachegen.cc:178 @@@ -2425,7 -2409,7 +2425,7 @@@ msgstr " #: apt-pkg/pkgcachegen.cc:245 #, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" #: apt-pkg/pkgcachegen.cc:251 @@@ -2472,41 -2456,41 +2472,41 @@@ msgstr " msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, 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:1278 +#: apt-pkg/acquire-item.cc:1329 #, 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:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "" @@@ -2615,52 -2599,52 +2615,52 @@@ msgstr " msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, fuzzy, c-format msgid "Preparing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se sa %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, fuzzy, c-format msgid "Installed %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, fuzzy, c-format msgid "Removing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, fuzzy, c-format msgid "Removed %s" msgstr "Preporučuje" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" diff --combined po/ca.po index a5539ddd7,7abb92988..9f34b85d3 --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-02-05 22:00+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@@ -160,7 -160,7 +160,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -657,7 -657,7 +657,7 @@@ msgstr "No s'ha pogut canviar el nom d msgid "Y" msgstr "S" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@@ -820,11 -820,11 +820,11 @@@ msgstr "Els paquets necessiten ser elim msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." @@@ -854,7 -854,7 +854,7 @@@ msgstr "Després de desempaquetar s'usa 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:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@@ -883,7 -883,7 +883,7 @@@ msgstr " "Per a continuar escriviu la frase «%s»\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Avortat." @@@ -891,7 -891,7 +891,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@@ -900,7 -900,7 +900,7 @@@ msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" @@@ -1036,7 -1036,7 +1036,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "La següent informació pot ajudar-vos a resoldre la situació:" @@@ -1050,31 -1050,31 +1050,31 @@@ msgstr " msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "No s'ha pogut trobar el paquet %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "però s'instal·larà %s" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1082,7 -1082,7 +1082,7 @@@ msgstr " "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1094,7 -1094,7 +1094,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1104,135 -1104,120 +1104,135 @@@ 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:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Paquets trencats" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Paquets suggerits:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Paquets recomanats:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Ha fallat" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Fet" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 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:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, 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:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja descarregat «%s»\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Ha fallat el procés fill" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1241,7 -1226,7 +1241,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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1250,32 -1235,32 +1250,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Mòduls suportats:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1587,9 -1572,9 +1587,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" @@@ -1891,7 -1876,7 +1891,7 @@@ msgstr "S'ha esgotat el temps de connex msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@@ -1918,39 -1903,39 +1918,39 @@@ msgstr "Consulta msgid "Unable to invoke " msgstr "No es pot invocar" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "S'està connectant amb %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "No s'ha pogut crear un sòcol per a %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "No es pot iniciar la connexió amb %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "S'està connectant amb %s" @@@ -2030,76 -2015,76 +2030,76 @@@ msgstr "No s'ha pogut obrir un conduct msgid "Read error from %s process" msgstr "Error llegint des del procés %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor http ha enviat una capçalera de resposta no vàlida" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Aquest servidor http té el suport d'abast trencat" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Error intern" @@@ -2117,57 -2102,57 +2117,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:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreujament de tipus no reconegut: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "S'està obrint el fitxer de configuració %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Línia %d massa llarga (màx %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error sintàctic %s:%u: Etiqueta malformada" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, 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:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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" @@@ -2234,7 -2219,6 +2234,7 @@@ msgid "Unable to stat the mount point % msgstr "No es pot obtenir informació del punt de muntatge %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "No es pot canviar a %s" @@@ -2482,7 -2466,7 +2482,7 @@@ msgstr " "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "El tipus de fitxer índex '%s', no està suportat" @@@ -2602,7 -2586,7 +2602,7 @@@ msgstr "S'ha produït un error durant e #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2632,7 -2616,7 +2632,7 @@@ msgstr "S'ha produït un error durant e #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2685,21 -2669,21 +2685,21 @@@ msgstr "S'estan recollint els fitxers q msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2709,7 -2693,7 +2709,7 @@@ msgstr " "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2718,7 -2702,7 +2718,7 @@@ msgstr " "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2726,7 -2710,7 +2726,7 @@@ msgstr " "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "La mida no concorda" @@@ -2839,52 -2823,52 +2839,52 @@@ msgstr " "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " "coincidents\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "S'està preparant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "S'està preparant per a configurar el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "S'està configurant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "S'ha instal·lat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "S'està preparant per a l'eliminació del paquet %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "S'està eliminant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "S'ha eliminat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "S'està preparant per a eliminar completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "S'ha eliminat completament el paquet %s" diff --combined po/cs.po index b1b0318d1,224131091..185f40987 --- a/po/cs.po +++ b/po/cs.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-04 18:53+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@@ -158,7 -158,7 +158,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -652,7 -652,7 +652,7 @@@ msgstr "Selhalo přejmenování %s na % msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@@ -813,11 -813,11 +813,11 @@@ msgstr "Balík je potřeba odstranit al msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." @@@ -847,7 -847,7 +847,7 @@@ msgstr "Po rozbalení bude na disku pou msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" @@@ -876,7 -876,7 +876,7 @@@ msgstr " "Pro pokračování opiÅ¡te frázi '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "PřeruÅ¡eno." @@@ -884,7 -884,7 +884,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@@ -893,7 -893,7 +893,7 @@@ msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" @@@ -1027,7 -1027,7 +1027,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřeÅ¡it tuto situaci:" @@@ -1040,31 -1040,31 +1040,31 @@@ msgstr "Vnitřní chyba, řeÅ¡itel prob msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Nemohu najít balík %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "ale %s se bude instalovat" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1072,7 -1072,7 +1072,7 @@@ msgstr " "Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo " "navrhněte řeÅ¡ení)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1083,7 -1083,7 +1083,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1093,139 -1093,124 +1093,139 @@@ msgstr " "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "PoÅ¡kozené balíky" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Navrhované balíky:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Doporučované balíky:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Selhalo" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Hotovo" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řeÅ¡itel problémů pokazil věci" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Synovský proces selhal" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, 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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1234,31 -1219,31 +1234,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Podporované moduly:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1563,9 -1548,9 +1563,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Nemohu číst %s" @@@ -1864,7 -1849,7 +1864,7 @@@ msgstr "Spojení datového socketu vypr msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@@ -1891,39 -1876,39 +1891,39 @@@ msgstr "Dotaz msgid "Unable to invoke " msgstr "Nemohu vyvolat " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Připojuji se k %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nemohu vytvořit socket pro %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nemohu navázat spojení na %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Připojuji se k %s" @@@ -1998,76 -1983,76 +1998,76 @@@ msgstr "Nemohu otevřít rouru pro %s msgid "Read error from %s process" msgstr "Chyba čtení z procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čekám na hlavičky" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal jsem jednu řádku hlavičky přes %u znaků" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http server poslal neplatnou hlavičku odpovědi" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http server poslal neplatnou hlavičku Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http server poslal neplatnou hlavičku Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má porouchanou podporu rozsahů" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Čas spojení vyprÅ¡el" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Å patné datové záhlaví" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Vnitřní chyba" @@@ -2085,58 -2070,58 +2085,58 @@@ msgstr "NeÅ¡lo mmapovat %lu bajtů msgid "Selection %s not found" msgstr "Výběr %s nenalezen" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nerozpoznaná zkratka typu: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Otevírám konfigurační soubor %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Řádek %d je příliÅ¡ dlouhý (max %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Zkomolená značka" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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í" @@@ -2203,7 -2188,6 +2203,7 @@@ msgid "Unable to stat the mount point % msgstr "Nelze vyhodnotit přípojný bod %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Nemohu přejít do %s" @@@ -2450,7 -2434,7 +2450,7 @@@ msgstr " "smyčce v Conflicts/Pre-Depends. To je často Å¡patné, ale pokud to skutečně " "chcete udělat, aktivujte možnost APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexový typ souboru '%s' není podporován" @@@ -2566,7 -2550,7 +2566,7 @@@ msgstr "Při zpracování %s se objevil #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2596,7 -2580,7 +2596,7 @@@ msgstr "Při zpracování %s se objevil #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2646,21 -2630,21 +2646,21 @@@ msgstr "Collecting File poskytuje msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2669,7 -2653,7 +2669,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2678,14 -2662,14 +2678,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, 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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@@ -2797,52 -2781,52 +2797,52 @@@ msgid "Wrote %i records with %i missin msgstr "" "Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Připravuji %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Rozbaluji %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Připravuji nastavení %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Nastavuji %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Nainstalován %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Připravuji odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Odstraňuji %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Připravuji úplné odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" diff --combined po/cy.po index b1042a21b,c882106df..f0485cca9 --- a/po/cy.po +++ b/po/cy.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@@ -174,7 -174,7 +174,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" @@@ -680,7 -680,7 +680,7 @@@ msgstr "Methwyd ailenwi %s at %s msgid "Y" msgstr "I" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@@ -850,11 -850,11 +850,11 @@@ msgstr "Rhaid tynnu pecynnau on mae Tyn msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." @@@ -883,7 -883,7 +883,7 @@@ msgstr "Ar ôl dadbacio defnyddir %sB msgid "After unpacking %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" @@@ -912,7 -912,7 +912,7 @@@ msgstr " "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Erthylu." @@@ -921,7 -921,7 +921,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" @@@ -930,7 -930,7 +930,7 @@@ msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" @@@ -1067,7 -1067,7 +1067,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" @@@ -1081,32 -1081,32 +1081,32 @@@ msgstr "Gwall Mewnol, torrodd AllUpgrad msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Methwyd canfod pecyn %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:" # FIXME --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1115,7 -1115,7 +1115,7 @@@ msgstr " "pecyn (neu penodwch ddatrys)" # FIXME: needs commas --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1128,7 -1128,7 +1128,7 @@@ msgstr " "heb gael eu symud allan o Incoming." # FIXME: commas, wrapping --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1137,133 -1137,118 +1137,133 @@@ msgstr " "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n" "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Pecynnau wedi torri" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Methwyd" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Wedi Gorffen" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Methodd proses plentyn" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1272,7 -1257,7 +1272,7 @@@ msgstr " "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1281,34 -1266,34 +1281,34 @@@ msgstr " "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1625,9 -1610,9 +1625,9 @@@ msgstr "Cyfatebiad pecyn trosysgrifo gy msgid "File %s/%s overwrites the one in the package %s" msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" @@@ -1943,7 -1928,7 +1943,7 @@@ msgstr "Goramserodd cysylltiad y soced msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@@ -1971,39 -1956,39 +1971,39 @@@ msgstr "Ymholiad msgid "Unable to invoke " msgstr "Methwyd gweithredu " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" @@@ -2076,82 -2061,82 +2076,82 @@@ msgstr "Methwyd agor pibell ar gyfer %s msgid "Read error from %s process" msgstr "Gwall darllen o broses %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:586 +#: methods/http.cc:585 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:601 +#: methods/http.cc:600 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:603 +#: methods/http.cc:602 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:875 +#: methods/http.cc:874 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1108 +#: methods/http.cc:1110 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Gwall mewnol" @@@ -2169,59 -2154,59 +2169,59 @@@ msgstr "Methwyd gwneud mmap() efo %lu b msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Linell %d yn rhy hir (uchaf %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" @@@ -2290,7 -2275,6 +2290,7 @@@ msgid "Unable to stat the mount point % msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" @@@ -2546,7 -2530,7 +2546,7 @@@ msgstr " "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" @@@ -2671,7 -2655,7 +2671,7 @@@ msgstr "Digwyddod gwall wrth brosesu % #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2701,7 -2685,7 +2701,7 @@@ msgstr "Digwyddod gwall wrth brosesu % #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2751,22 -2735,22 +2751,22 @@@ msgstr "Yn Casglu Darpariaethau Ffeil msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2775,7 -2759,7 +2775,7 @@@ msgstr " "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2784,14 -2768,14 +2784,14 @@@ msgstr " "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@@ -2901,52 -2885,52 +2901,52 @@@ msgstr " msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" diff --combined po/da.po index 04ae3a00f,32d1d5292..19083b66a --- a/po/da.po +++ b/po/da.po @@@ -9,7 -9,7 +9,7 @@@ msgid " msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2007-02-03 15:50+0100\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish\n" @@@ -164,7 -164,7 +164,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -660,7 -660,7 +660,7 @@@ msgstr "Kunne ikke omdøbe %s til %s msgid "Y" msgstr "J" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" @@@ -821,11 -821,11 +821,11 @@@ msgstr "Pakker skal afinstalleres, men msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldført" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke læses." @@@ -854,7 -854,7 +854,7 @@@ msgstr "Efter udpakning vil %sB yderlig msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" @@@ -883,7 -883,7 +883,7 @@@ msgstr " "For at fortsætte, skal du skrive '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Afbryder." @@@ -891,7 -891,7 +891,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@@ -900,7 -900,7 +900,7 @@@ msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" @@@ -1036,7 -1036,7 +1036,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" @@@ -1049,31 -1049,31 +1049,31 @@@ msgstr "Intern fejl. Problemløseren øde msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade ødelagde noget" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Kunne ikke finde pakken %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "men %s forventes installeret" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1081,7 -1081,7 +1081,7 @@@ msgstr " "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv " "en løsning)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1092,7 -1092,7 +1092,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1101,130 -1101,115 +1101,130 @@@ 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:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Ødelagte pakker" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Foreslåede pakker:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Anbefalede pakker:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislykkedes" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Færdig" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemløseren ødelagde noget" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Barneprocessen fejlede" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1232,7 -1217,7 +1232,7 @@@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1241,32 -1226,32 +1241,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Understøttede moduler:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1577,9 -1562,9 +1577,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke læse %s" @@@ -1879,7 -1864,7 +1879,7 @@@ msgstr "Tidsudløb på datasokkel-forbind msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@@ -1906,39 -1891,39 +1906,39 @@@ msgstr "Forespørgsel msgid "Unable to invoke " msgstr "Kunne ikke udføre " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Forbinder til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan ikke oprette forbindelse til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Forbinder til %s" @@@ -2014,77 -1999,77 +2014,77 @@@ msgstr "Kunne ikke åbne datarør for %s msgid "Read error from %s process" msgstr "Læsefejl fra %s-process" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Afventer hoveder" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fandt en enkelt linje i hovedet på over %u tegn" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Ugyldig linje i hovedet" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http-serveren sendte et ugyldigt svarhovede" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http-serveren sendte et ugyldigt Content-Length-hovede" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http-serveren sendte et ugyldigt Content-Range-hovede" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" "Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Intern fejl" @@@ -2102,57 -2087,57 +2102,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:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukendt type-forkortelse: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Åbner konfigurationsfilen %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Linjen %d er for lang (må højst være %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfejl %s:%u: Forkert udformet mærke" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfejl %s:%u: Inkluderet herfra" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen" @@@ -2219,7 -2204,6 +2219,7 @@@ msgid "Unable to stat the mount point % msgstr "Kunne ikke finde monteringspunktet %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Kunne ikke skifte til %s" @@@ -2467,7 -2451,7 +2467,7 @@@ msgstr " "idé, men hvis du virkelig vil gøre det, kan du aktivere valget 'APT::Force-" "LoopBreak'." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indeksfiler af typen '%s' understøttes ikke" @@@ -2584,7 -2568,7 +2584,7 @@@ msgstr "Der skete en fejl under behandl #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2614,7 -2598,7 +2614,7 @@@ msgstr "Der skete en fejl under behandl #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2664,22 -2648,22 +2664,22 @@@ msgstr "Samler filudbud msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "omdøbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2688,7 -2672,7 +2688,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2697,13 -2681,13 +2697,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, 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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" @@@ -2814,52 -2798,52 +2814,52 @@@ 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Klargør %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Pakker %s ud" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Gør klar til at sætte %s op" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Sætter %s op" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Installerede %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Gør klar til afinstallation af %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Fjernede %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Gør klar til at fjerne %s helt" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Fjernede %s helt" diff --combined po/de.po index 511cea271,d45f634aa..8870f62ff --- a/po/de.po +++ b/po/de.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-24 11:45+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@@ -158,7 -158,7 +158,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -669,7 -669,7 +669,7 @@@ msgstr "Konnte %s nicht in %s umbenenne msgid "Y" msgstr "J" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" @@@ -830,11 -830,11 +830,11 @@@ msgstr "Pakete müssen entfernt werden msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." @@@ -865,7 -865,7 +865,7 @@@ msgstr "Nach dem Auspacken werden %sB P 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:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" @@@ -894,7 -894,7 +894,7 @@@ msgstr " "Zum Fortfahren geben Sie bitte „%s“ ein.\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Abbruch." @@@ -902,7 -902,7 +902,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" @@@ -911,7 -911,7 +911,7 @@@ msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" @@@ -1048,7 -1048,7 +1048,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" @@@ -1062,31 -1062,31 +1062,31 @@@ msgstr "Interner Fehler, der Problem-Là msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Konnte Paket %s nicht finden" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "aber %s soll installiert werden" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren:" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1094,7 -1094,7 +1094,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:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1106,7 -1106,7 +1106,7 @@@ msgstr " "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1117,134 -1117,119 +1117,134 @@@ msgstr " "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Kaputte Pakete" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fehlgeschlagen" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Fertig" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Überspringe schon heruntergeladene Datei „%s“\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, 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:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl „%s“ fehlgeschlagen.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Überprüfen Sie, ob das Paket „dpkg-dev“ installiert ist.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl „%s“ fehlgeschlagen.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1253,7 -1238,7 +1253,7 @@@ msgstr " "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1262,32 -1247,32 +1262,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-Abhängigkeiten für %s konnten nicht erfüllt werden." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Abhängigkeiten fehlgeschlagen" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Unterstützte Module:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1603,9 -1588,9 +1603,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Kann %s nicht lesen" @@@ -1909,7 -1894,7 +1909,7 @@@ msgstr "Datenverbindungsaufbau erlitt Z msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@@ -1936,40 -1921,40 +1936,40 @@@ msgstr "Abfrage msgid "Unable to invoke " msgstr "Kann nicht aufrufen: " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Verbinde mit %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kann keinen Verbindungsendpunkt für %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kann keine Verbindung mit %s:%s aufbauen (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Verbinde mit %s" @@@ -2048,78 -2033,78 +2048,78 @@@ msgstr "Konnte keine Pipe für %s öffn msgid "Read error from %s process" msgstr "Lesefehler von Prozess %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Warte auf Kopfzeilen (header)" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Schlechte Kopfzeile" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Der http-Server sandte eine ungültige „Content-Length“-Kopfzeile" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Der http-Server sandte eine ungültige „Content-Range“-Kopfzeile" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Interner Fehler" @@@ -2137,58 -2122,58 +2137,58 @@@ msgstr "Konnte kein mmap von %lu Bytes msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nicht erkannte Typabkürzung: „%c“" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Öffne Konfigurationsdatei %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Zeile %d zu lang (maximal %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfehler %s:%u: Einbindung von here" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive „%s“" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende" @@@ -2256,7 -2241,6 +2256,7 @@@ msgid "Unable to stat the mount point % msgstr "Kann auf den Einhängepunkt %s nicht zugreifen." #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Kann nicht nach %s wechseln" @@@ -2504,7 -2488,7 +2504,7 @@@ msgstr " "ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte " "die Option APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexdateityp „%s“ wird nicht unterstützt" @@@ -2627,7 -2611,7 +2627,7 @@@ msgstr "Ein Fehler trat beim Bearbeite #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2657,7 -2641,7 +2657,7 @@@ msgstr "Ein Fehler trat beim Bearbeite #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2713,22 -2697,22 +2713,22 @@@ msgstr "Sammle Datei-Empfehlungen ein msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Sichern des Quellcaches" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2737,7 -2721,7 +2737,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2746,14 -2730,14 +2746,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, 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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@@ -2866,52 -2850,52 +2866,52 @@@ msgstr " "Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien " "geschrieben.\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s wird entpackt" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Konfiguration von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Konfiguriere %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s installiert" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Entfernen von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s wird entfernt" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s entfernt" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Komplettes Entfernen von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s komplett entfernt" diff --combined po/el.po index 2d6d9069f,f2459879f..2cbbcf291 --- a/po/el.po +++ b/po/el.po @@@ -18,7 -18,7 +18,7 @@@ msgid " msgstr "" "Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-01-18 15:16+0200\n" "Last-Translator: Konstantinos Margaritis \n" "Language-Team: Greek \n" @@@ -173,7 -173,7 +173,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -673,7 -673,7 +673,7 @@@ msgstr "Αποτυχία μετονομ msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@@ -837,11 -837,11 +837,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." @@@ -872,7 -872,7 +872,7 @@@ msgstr "Μετά την αποσυμπΠmsgid "After unpacking %sB disk space will be freed.\n" msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" @@@ -901,7 -901,7 +901,7 @@@ msgstr " "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Εγκατάλειψη." @@@ -909,7 -909,7 +909,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@@ -918,7 -918,7 +918,7 @@@ msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" @@@ -1057,7 -1057,7 +1057,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" @@@ -1072,31 -1072,31 +1072,31 @@@ msgstr " msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1104,7 -1104,7 +1104,7 @@@ msgstr " "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1116,7 -1116,7 +1116,7 @@@ msgstr " "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1126,135 -1126,120 +1126,135 @@@ msgstr " "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n" "αναφορά σφάλματος για αυτό το πακέτο." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Απέτυχε" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Ετοιμο" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1262,7 -1247,7 +1262,7 @@@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1271,32 -1256,32 +1271,32 @@@ msgstr " "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1607,9 -1592,9 +1607,9 @@@ msgstr "Αντικατάσταση πα msgid "File %s/%s overwrites the one in the package %s" msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Αδύνατη η ανάγνωση του %s" @@@ -1908,7 -1893,7 +1908,7 @@@ msgstr "Λήξη χρόνου σύνδΠmsgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@@ -1935,39 -1920,39 +1935,39 @@@ msgstr "Επερώτηση msgid "Unable to invoke " msgstr "Αδύνατη η εκτέλεση" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Σύνδεση στο %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Αδύνατη η δημιουργία υποδοχής για το %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" @@@ -2043,77 -2028,77 +2043,77 @@@ msgstr "Αδύνατο το άνοιγΠmsgid "Read error from %s process" msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Αναμονή επικεφαλίδων" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Ελαττωματική γραμμή επικεφαλίδας" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@@ -2131,58 -2116,58 +2131,58 @@@ msgstr "Αδύνατη η απεικόΠmsgid "Selection %s not found" msgstr "Η επιλογή %s δε βρέθηκε" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Η γραμμή %d έχει υπερβολικό μήκος (μέγιστο %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα." --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου" @@@ -2250,7 -2235,6 +2250,7 @@@ msgid "Unable to stat the mount point % msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Αδύνατη η αλλαγή σε %s" @@@ -2501,7 -2485,7 +2501,7 @@@ msgstr " "είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την " "επιλογή APT::Force-LoopBreak option." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται" @@@ -2623,7 -2607,7 +2623,7 @@@ msgstr "Προέκυψε σφάλμα Î #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2653,7 -2637,7 +2653,7 @@@ msgstr "Προέκυψε σφάλμα Î #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2704,21 -2688,21 +2704,21 @@@ msgstr "Συλλογή Παροχών Î msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2727,7 -2711,7 +2727,7 @@@ msgstr " "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2736,7 -2720,7 +2736,7 @@@ msgstr " "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2744,7 -2728,7 +2744,7 @@@ msgstr " "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@@ -2855,52 -2839,52 +2855,52 @@@ 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Προετοιμασία του %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Ξεπακετάρισμα του %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Ρύθμιση του %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Εγκατέστησα το %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Προετοιμασία για την αφαίρεση του %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Αφαιρώ το %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Αφαίρεσα το %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Αποτυχία διαγραφής του %s" diff --combined po/en_GB.po index b8c284b7b,eba9735c5..bc9bf3a50 --- a/po/en_GB.po +++ b/po/en_GB.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-12 11:07+0100\n" "Last-Translator: Neil Williams \n" "Language-Team: en_GB \n" @@@ -158,7 -158,7 +158,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s compiled on %s %s\n" @@@ -653,7 -653,7 +653,7 @@@ msgstr "Failed to rename %s to %s msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" @@@ -814,11 -814,11 +814,11 @@@ msgstr "Packages need to be removed bu msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." @@@ -847,7 -847,7 +847,7 @@@ msgstr "After unpacking %sB of addition msgid "After unpacking %sB disk space will be freed.\n" msgstr "After unpacking %sB disk space will be freed.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" @@@ -876,7 -876,7 +876,7 @@@ msgstr " "To continue type in the phrase ‘%s’\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Abort." @@@ -884,7 -884,7 +884,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" @@@ -893,7 -893,7 +893,7 @@@ msgid "Some files failed to download" msgstr "Some files failed to download" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" @@@ -1027,7 -1027,7 +1027,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "The following information may help to resolve the situation:" @@@ -1040,31 -1040,31 +1040,31 @@@ msgstr "Internal error, problem resolve msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Couldn't find package %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "but %s is to be installed" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1072,7 -1072,7 +1072,7 @@@ msgstr " "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1084,7 -1084,7 +1084,7 @@@ msgstr " "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1094,130 -1094,115 +1094,130 @@@ msgstr " "the package is simply not installable and a bug report against\n" "that package should be filed." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Broken packages" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Suggested packages:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Recommended packages:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Calculating upgrade... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Failed" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Done" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "Must specify at least one package for which to fetch source" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping already downloaded file '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "You don't have enough free space in %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Need to get %sB/%sB of source archives.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Skipping unpack of already unpacked source in %s\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Check if the 'dpkg-dev' package is installed.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Child process failed" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "Must specify at least one package to check builddeps for" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1226,7 -1211,7 +1226,7 @@@ msgstr " "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1235,31 -1220,31 +1235,31 @@@ msgstr " "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Supported modules:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1566,9 -1551,9 +1566,9 @@@ msgstr "Overwrite package match with n msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overwrites the one in the package %s" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Unable to read %s" @@@ -1867,7 -1852,7 +1867,7 @@@ msgstr "Data socket connect timed out msgid "Unable to accept connection" msgstr "Unable to accept connection" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@@ -1894,39 -1879,39 +1894,39 @@@ msgstr "Query msgid "Unable to invoke " msgstr "Unable to invoke" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Connecting to %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Could not create a socket for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Cannot initiate the connection to %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Could not connect to %s:%s (%s), connection timed out" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Could not connect to %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connecting to %s" @@@ -2001,76 -1986,76 +2001,76 @@@ msgstr "Couldn't open pipe for %s msgid "Read error from %s process" msgstr "Read error from %s process" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Waiting for headers" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Got a single header line over %u chars" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Bad header line" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "The HTTP server sent an invalid reply header" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "The HTTP server sent an invalid Content-Length header" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "The HTTP server sent an invalid Content-Range header" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "This HTTP server has broken range support" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Internal error" @@@ -2088,57 -2073,57 +2088,57 @@@ msgstr "Couldn't make mmap of %lu bytes msgid "Selection %s not found" msgstr "Selection %s not found" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Unrecognized type abbreviation: ‘%c’" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Opening configuration file %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Line %d too long (max %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Block starts with no name." --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Malformed tag" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: Extra junk after value" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntax error %s:%u: Directives can only be done at the top level" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Too many nested includes" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Included from here" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: Extra junk at end of file" @@@ -2205,7 -2190,6 +2205,7 @@@ msgid "Unable to stat the mount point % msgstr "Unable to stat the mount point %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Unable to change to %s" @@@ -2452,7 -2436,7 +2452,7 @@@ msgstr " "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Index file type ‘%s’ is not supported" @@@ -2569,7 -2553,7 +2569,7 @@@ msgstr "Error occurred while processin #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Error occurred while processing %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2599,7 -2583,7 +2599,7 @@@ msgstr "Error occurred while processin #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Error occurred while processing %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2647,21 -2631,21 +2647,21 @@@ msgstr "Collecting File Provides msgid "IO Error saving source cache" msgstr "IO Error saving source cache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "There is no public key available for the following key IDs:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2670,7 -2654,7 +2670,7 @@@ msgstr " "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)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2679,14 -2663,14 +2679,14 @@@ msgstr " "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "The package index files are corrupted. No Filename: field for package %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Size mismatch" @@@ -2797,52 -2781,52 +2797,52 @@@ msgstr "Wrote %i records with %i mismat msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Wrote %i records with %i missing files and %i mismatched files\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Preparing %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Unpacking %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Preparing to configure %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Configuring %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Installed %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Preparing for removal of %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Removing %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Removed %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparing to completely remove %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Completely removed %s" diff --combined po/es.po index 1b8a778cd,ffa43d739..0ee2b5faf --- a/po/es.po +++ b/po/es.po @@@ -10,7 -10,7 +10,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-08 00:23+0200\n" "Last-Translator: Javier Fernandez-Sanguino \n" "Language-Team: Debian Spanish \n" @@@ -163,7 -163,7 +163,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -668,7 -668,7 +668,7 @@@ msgstr "Falló el renombre de %s a %s msgid "Y" msgstr "S" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" @@@ -829,11 -829,11 +829,11 @@@ msgstr "Los paquetes necesitan eliminar msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no terminó el ordenamiento" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." @@@ -865,7 -865,7 +865,7 @@@ msgstr " msgid "After unpacking %sB disk space will be freed.\n" msgstr "Se liberarán %sB después de desempaquetar.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" @@@ -894,7 -894,7 +894,7 @@@ msgstr " "Para continuar escriba la frase «%s»\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Abortado." @@@ -902,7 -902,7 +902,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@@ -911,7 -911,7 +911,7 @@@ msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" @@@ -1045,7 -1045,7 +1045,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información puede ayudar a resolver la situación:" @@@ -1060,31 -1060,31 +1060,31 @@@ msgstr " msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompió cosas" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "No se pudo encontrar el paquete %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "pero %s va a ser instalado" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1092,7 -1092,7 +1092,7 @@@ msgstr " "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solución)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1104,7 -1104,7 +1104,7 @@@ msgstr " "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1114,134 -1114,119 +1114,134 @@@ msgstr " "paquete simplemente no sea instalable y debería de rellenar un informe de\n" "error contra ese paquete." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Paquetes rotos" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Paquetes recomendados" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Falló" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Listo" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 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:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, 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:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando fichero ya descargado '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento '%s'.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción '%s'.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Falló el proceso hijo" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1250,7 -1235,7 +1250,7 @@@ msgstr " "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1259,32 -1244,32 +1259,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Módulos soportados:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1599,9 -1584,9 +1599,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" @@@ -1901,7 -1886,7 +1901,7 @@@ msgstr "Expiró conexión a socket de dat msgid "Unable to accept connection" msgstr "No pude aceptar la conexión" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@@ -1928,39 -1913,39 +1928,39 @@@ msgstr "Consulta msgid "Unable to invoke " msgstr "No pude invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectando a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "No pude crear un socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "No puedo iniciar la conexión a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@@ -2037,76 -2022,76 +2037,76 @@@ msgstr "No pude abrir una tubería para msgid "Read error from %s process" msgstr "Error de lectura de %s procesos" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Esperando las cabeceras" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Mala línea de cabecera" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor de http envió una cabecera de respuesta inválida" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor de http envió una cabecera de Content-Length inválida" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor de http envió una cabecera de Content-Range inválida" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Éste servidor de http tiene el soporte de alcance roto" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Falló la selección" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Expiró la conexión" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Fallo la conexión" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Error interno" @@@ -2124,59 -2109,59 +2124,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:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo de abreviación no reconocida: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Abriendo fichero de configuración %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Línea %d demasiado larga (máx %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error de sintaxis %s:%u: Marca mal formada" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error de sintaxis %s:%u: Incluido desde aquí" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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" @@@ -2245,7 -2230,6 +2245,7 @@@ msgid "Unable to stat the mount point % msgstr "No se puede obtener información del punto de montaje %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "No se pudo cambiar a %s" @@@ -2493,7 -2477,7 +2493,7 @@@ msgstr " "Esto generalmente es malo, pero si realmente quiere hacerlo, active \n" "la opción APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "No se da soporte para el tipo de archivo de índice '%s'" @@@ -2615,7 -2599,7 +2615,7 @@@ msgstr "Ocurrió un error mientras se pr #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Ocurrió un error mientras se procesaba %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2645,7 -2629,7 +2645,7 @@@ msgstr "Ocurrió un error mientras se pr #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Ocurrió un error mientras se procesaba %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2698,23 -2682,23 +2698,23 @@@ msgstr "Recogiendo archivos que proveen msgid "IO Error saving source cache" msgstr "Error de E/S guardando caché fuente" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "falló el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2724,7 -2708,7 +2724,7 @@@ msgstr " "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2733,7 -2717,7 +2733,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2741,7 -2725,7 +2741,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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "El tamaño difiere" @@@ -2853,52 -2837,52 +2853,52 @@@ 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Preparándose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Preparándose para eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s eliminado" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose para eliminar completamente %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Se borró completamente %s" diff --combined po/eu.po index a6740195b,f27f1005a..05b8dc43d --- a/po/eu.po +++ b/po/eu.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-09-27 13:59+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: librezale \n" @@@ -163,7 -163,7 +163,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -657,7 -657,7 +657,7 @@@ msgstr "Huts egin du %s izenaren ordez msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio-errorea - %s" @@@ -818,11 -818,11 +818,11 @@@ msgstr "Paketeak ezabatu beharra dute b msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga-direktorioa blokeatu" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Ezin izan da iturburu-zerrenda irakurri." @@@ -853,7 -853,7 +853,7 @@@ msgstr "Deskonprimitu ondoren, %sB gehi msgid "After unpacking %sB disk space will be freed.\n" msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." @@@ -882,7 -882,7 +882,7 @@@ msgstr " "Jarratzeko, idatzi '%s' esaldia\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Abortatu." @@@ -890,7 -890,7 +890,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@@ -899,7 -899,7 +899,7 @@@ msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" @@@ -1033,7 -1033,7 +1033,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" @@@ -1046,31 -1046,31 +1046,31 @@@ msgstr "Barne Errorea, arazo konpontzai msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Ezin izan da %s paketea aurkitu" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "baina %s instalatzeko dago" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1078,7 -1078,7 +1078,7 @@@ msgstr " "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1090,7 -1090,7 +1090,7 @@@ msgstr " "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1099,132 -1099,117 +1099,132 @@@ 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:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Hautsitako paketeak" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Huts egin du" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Eginda" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturubura\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze-mendekotasunik.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1232,7 -1217,7 +1232,7 @@@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1241,32 -1226,32 +1241,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Onartutako Moduluak:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1574,9 -1559,9 +1574,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" @@@ -1880,7 -1865,7 +1880,7 @@@ msgstr "Datu-socket konexioak denbora-m msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@@ -1907,40 -1892,40 +1907,40 @@@ msgstr "Kontsulta msgid "Unable to invoke " msgstr "Ezin da deitu " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Konektatzen -> %s..." @@@ -2015,76 -2000,76 +2015,76 @@@ msgstr "Ezin izan da %s(r)en kanalizazi msgid "Read error from %s process" msgstr "Irakurri errorea %s prozesutik" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Goiburuen zain" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Okerreko goiburu-lerroa" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du." -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http zerbitzariak barruti onarpena apurturik du" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Datu-formatu ezezaguna" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Konexioaren denbora-muga gainditu da" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Barne-errorea" @@@ -2102,57 -2087,57 +2102,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:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Mota ezezaguneko laburtzapena: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurazio-fitxategia irekitzen" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "%d lerroa luzeegia da (gehienez %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Sintasi errorea %s:%u: Gaizki eratutako" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Sintaxi-errorea, %s:%u: habiaratutako elementu gehiegi" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Sintaxi-errorea, %s:%u: hemendik barne hartuta" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Sintaxi-errorea, %s:%u: onartu gabeko '%s' direktiba" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran" @@@ -2220,7 -2205,6 +2220,7 @@@ msgid "Unable to stat the mount point % msgstr "Ezin da atzitu %s muntatze-puntua" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Ezin da %s(e)ra aldatu" @@@ -2471,7 -2455,7 +2471,7 @@@ msgstr " "izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak " "aukera." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "'%s' motako indize-fitxategirik ez da onartzen" @@@ -2587,7 -2571,7 +2587,7 @@@ msgstr "Errorea gertatu da %s prozesatz #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2617,7 -2601,7 +2617,7 @@@ msgstr "Errorea gertatu da %s prozesatz #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2665,21 -2649,21 +2665,21 @@@ msgstr "Fitxategi-erreferentziak biltze msgid "IO Error saving source cache" msgstr "S/I errorea iturburu-cachea gordetzean" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2688,7 -2672,7 +2688,7 @@@ msgstr " "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2697,7 -2681,7 +2697,7 @@@ msgstr " "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2705,7 -2689,7 +2705,7 @@@ msgstr " "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@@ -2816,52 -2800,52 +2816,52 @@@ msgid "Wrote %i records with %i missin msgstr "" "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s prestatzen" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s irekitzen" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "%s konfiguratzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "%s konfiguratzen" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s Instalatuta" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "%s kentzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s kentzen" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s kendurik" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "%s guztiz ezabatzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" diff --combined po/fi.po index f89621fd0,363c21508..9cfd02c39 --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-09-29 16:06+0300\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@@ -160,7 -160,7 +160,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -657,7 -657,7 +657,7 @@@ msgstr "Nimen muuttaminen %s -> %s ei o msgid "Y" msgstr "K" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@@ -818,11 -818,11 +818,11 @@@ msgstr "Paketteja pitäisi poistaa mutt msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." @@@ -852,7 -852,7 +852,7 @@@ msgstr "Purkamisen jälkeen käytetää msgid "After unpacking %sB disk space will be freed.\n" msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" @@@ -882,7 -882,7 +882,7 @@@ msgstr " "Jatka kirjoittamalla \"%s\"\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Keskeytä." @@@ -890,7 -890,7 +890,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@@ -899,7 -899,7 +899,7 @@@ msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" @@@ -1033,7 -1033,7 +1033,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" @@@ -1046,31 -1046,31 +1046,31 @@@ msgstr "Sisäinen virhe, resolver rikko msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Pakettia %s ei löytynyt" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "mutta %s on merkitty asennettavaksi" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1078,7 -1078,7 +1078,7 @@@ msgstr " "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1089,7 -1089,7 +1089,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1099,131 -1099,116 +1099,131 @@@ msgstr " "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" "tuosta paketista." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Rikkinäiset paketit" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Suositellut paketit:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Ei onnistunut" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Valmis" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1231,7 -1216,7 +1231,7 @@@ msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1240,32 -1225,32 +1240,32 @@@ msgstr " "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Tuetut moduulit:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1573,9 -1558,9 +1573,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" @@@ -1874,7 -1859,7 +1874,7 @@@ msgstr "Pistokkeen kytkeminen aikakatka msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@@ -1901,39 -1886,39 +1901,39 @@@ msgstr "Kysely msgid "Unable to invoke " msgstr "Käynnistys ei onnistu" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Yhteyden %s avaus ei onnistu: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Avataan yhteys %s" @@@ -2010,76 -1995,76 +2010,76 @@@ msgstr "Putkea %s ei voitu avata msgid "Read error from %s process" msgstr "Prosessi %s ilmoitti lukuvirheestä" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Odotetaan otsikoita" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Virheellinen otsikkorivi" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP-palvelimen arvoaluetuki on rikki" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Sisäinen virhe" @@@ -2097,57 -2082,57 +2097,57 @@@ msgstr "Ei voitu tehdä %lu tavun mmap: msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tuntematon tyypin lyhenne: \"%c\"" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Avataan asetustiedosto %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Rivi %d on liian pitkä (enintään %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa" @@@ -2214,7 -2199,6 +2214,7 @@@ msgid "Unable to stat the mount point % msgstr "Komento stat ei toiminut liitoskohdalle %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Kansioon %s vaihto ei onnistu" @@@ -2461,7 -2445,7 +2461,7 @@@ msgstr " "s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, mutta " "jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu" @@@ -2577,7 -2561,7 +2577,7 @@@ msgstr "Tapahtui virhe käsiteltäessà #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2607,7 -2591,7 +2607,7 @@@ msgstr "Tapahtui virhe käsiteltäessà #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2656,21 -2640,21 +2656,21 @@@ msgstr "Kootaan tiedostojen tarjoamisti msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2679,7 -2663,7 +2679,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2688,7 -2672,7 +2688,7 @@@ msgstr " "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2696,7 -2680,7 +2696,7 @@@ msgstr " "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Koko ei täsmää" @@@ -2811,52 -2795,52 +2811,52 @@@ msgstr " "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta " "tiedostoa\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Valmistellaan %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Puretaan %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Valmistaudutaan tekemään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Tehdään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s asennettu" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Valmistaudutaan poistamaan %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Poistetaan %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s poistettu" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Valmistaudutaan poistamaan %s kokonaan" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s poistettiin kokonaan" diff --combined po/fr.po index d422100e3,fa8e7e192..5de349f64 --- a/po/fr.po +++ b/po/fr.po @@@ -8,8 -8,8 +8,8 @@@ msgid " msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" -"PO-Revision-Date: 2007-06-12 22:24+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" +"PO-Revision-Date: 2007-05-08 11:30+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@@ -59,9 -59,8 +59,9 @@@ msgid "Total distinct versions: msgstr "Nombre de versions distinctes : " #: cmdline/apt-cache.cc:295 +#, fuzzy msgid "Total Distinct Descriptions: " -msgstr "Nombre de descriptions distinctes : " +msgstr "Nombre de versions distinctes : " #: cmdline/apt-cache.cc:297 msgid "Total dependencies: " @@@ -72,9 -71,8 +72,9 @@@ msgid "Total ver/file relations: msgstr "Nombre de relations version/fichier : " #: cmdline/apt-cache.cc:302 +#, fuzzy msgid "Total Desc/File relations: " -msgstr "Nombre de relations description/fichier : " +msgstr "Nombre de relations version/fichier : " #: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " @@@ -161,7 -159,7 +161,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -245,13 -243,11 +245,13 @@@ msgstr " #: 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 »" +msgstr "" +"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" #: cmdline/apt-cdrom.cc:93 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" +msgstr "" +"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." @@@ -327,8 -323,7 +327,8 @@@ 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:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" @@@ -444,8 -439,7 +444,8 @@@ msgstr "Aucune sélection ne correspond #: ftparchive/apt-ftparchive.cc:832 #, 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:43 #, c-format @@@ -668,7 -662,7 +668,7 @@@ msgstr "Impossible de changer le nom % msgid "Y" msgstr "O" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@@ -824,18 -818,17 +824,18 @@@ msgstr "Erreur interne, « InstallPackag #: cmdline/apt-get.cc:779 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:790 msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a été interrompu." --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut être lue." @@@ -859,15 -852,14 +859,15 @@@ msgstr "Il est nécessaire de prendre %s #: cmdline/apt-get.cc:844 #, 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:847 #, 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:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" @@@ -900,7 -892,7 +900,7 @@@ msgstr " "Pour continuer, tapez la phrase « %s »\n" " ?]" - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Annulation." @@@ -908,7 -900,7 +908,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" @@@ -917,7 -909,7 +917,7 @@@ msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" @@@ -931,8 -923,7 +931,8 @@@ msgstr " #: cmdline/apt-get.cc:1005 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:1010 msgid "Unable to correct missing packages." @@@ -994,8 -985,7 +994,8 @@@ msgstr "Aucun paquet ne correspond au p #: cmdline/apt-get.cc:1148 #, 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:1156 #, c-format @@@ -1035,66 -1025,64 +1035,66 @@@ msgstr " #: cmdline/apt-get.cc:1433 msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Aucune suppression n'est sensée se produire : impossible de lancer « Autoremover »" +msgstr "" #: cmdline/apt-get.cc:1465 +#, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" -msgstr "Les paquets suivants ont été installés automatiquement et ne sont plus nécessaires :" +msgstr "Les NOUVEAUX paquets suivants seront installés :" #: cmdline/apt-get.cc:1467 msgid "Use 'apt-get autoremove' to remove them." -msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer." +msgstr "" #: cmdline/apt-get.cc:1472 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -"Il semble que l'outil de suppression automatique (« Autoremover ») ait\n" -"supprimé quelque chose, ce qui est inattendu. Veuillez envoyer un\n" -"rapport de bogue pour le paquet « apt »." --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 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:1479 +#, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "Erreur interne, l'outil de suppression automatique a cassé quelque chose." +msgstr "" +"Erreur interne, la tentative de résolution du problème a cassé certaines " +"parties" #: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" --#: cmdline/apt-get.cc:1543 -#, c-format ++#: cmdline/apt-get.cc:1544 +#, fuzzy, c-format msgid "Couldn't find task %s" -msgstr "Impossible de trouver la tâche %s" +msgstr "Impossible de trouver le paquet %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 -#, c-format ++#: cmdline/apt-get.cc:1712 +#, fuzzy, c-format msgid "%s set to manual installed.\n" -msgstr "%s passé en « installé manuellement ».\n" +msgstr "mais %s devra être installé" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1102,7 -1090,7 +1102,7 @@@ msgstr " "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1114,7 -1102,7 +1114,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1123,134 -1111,119 +1123,134 @@@ 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:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Paquets défectueux" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Paquets suggérés :" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Paquets recommandés :" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Échec" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Fait" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de résolution du problème a cassé certaines " "parties" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, 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:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, 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:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Échec du processus fils" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1259,7 -1232,7 +1259,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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1268,34 -1241,32 +1268,34 @@@ 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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Modules reconnus :" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1374,7 -1345,7 +1374,7 @@@ msgstr " " -c=? Lit ce fichier de configuration\n" " -o=? Place une option de configuration arbitraire, ex. -o dir::cache=/tmp\n" "Reportez-vous aux pages de manuels d'apt-get(8), sources.list(5) et\n" -"apt.conf(5) pour plus d'informations et d'option.\n" +"apt.conf(5) pour plus d'information et d'option.\n" " Cet APT a les « Super Cow Powers »\n" #: cmdline/acqprogress.cc:55 @@@ -1469,8 -1440,7 +1469,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." @@@ -1608,9 -1578,9 +1608,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" @@@ -1728,8 -1698,7 +1728,8 @@@ msgstr "Ce n'est pas une archive DEB va #: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »" +msgstr "" +"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »" #: apt-inst/deb/debfile.cc:108 #, c-format @@@ -1833,8 -1802,7 +1833,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 @@@ -1871,8 -1839,7 +1871,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." @@@ -1916,7 -1883,7 +1916,7 @@@ msgstr "Délai de connexion au port de d msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" @@@ -1943,39 -1910,39 +1943,39 @@@ msgstr "Requête msgid "Unable to invoke " msgstr "Impossible d'invoquer " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Connexion à %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP : %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossible d'initialiser la connexion à %s: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connexion à %s" @@@ -2009,12 -1976,10 +2009,12 @@@ msgstr "Impossible d'accéder au porte-c #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." +msgstr "" +"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." #: methods/gpgv.cc:204 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +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é." @@@ -2056,76 -2021,76 +2056,76 @@@ msgstr "Ne parvient pas à ouvrir le tub msgid "Read error from %s process" msgstr "Erreur de lecture du processus %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tête" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tête" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 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" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ce serveur http possède un support des limites non-valide" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Erreur interne" @@@ -2143,59 -2108,59 +2143,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:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Type d'abréviation non reconnue : « %c »" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Ouverture du fichier de configuration %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "La ligne %d est trop longue (maxi %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erreur syntaxique %s:%u : balise mal formée" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier" @@@ -2262,7 -2227,6 +2262,7 @@@ msgid "Unable to stat the mount point % msgstr "Impossible de localiser le point de montage %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Impossible d'accéder à %s" @@@ -2389,7 -2353,7 +2389,7 @@@ msgstr "Rend obsolète #: apt-pkg/pkgcache.cc:226 msgid "Breaks" -msgstr "Casse" +msgstr "" #: apt-pkg/pkgcache.cc:237 msgid "important" @@@ -2424,19 -2388,18 +2424,19 @@@ msgid "Dependency generation msgstr "Génération des dépendances" #: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy msgid "Reading state information" -msgstr "Lecture des informations d'état" +msgstr "Fusion des informations disponibles" #: apt-pkg/depcache.cc:198 -#, c-format +#, fuzzy, c-format msgid "Failed to open StateFile %s" -msgstr "Impossible d'ouvrir le fichier d'état %s" +msgstr "Impossible d'ouvrir %s" #: apt-pkg/depcache.cc:204 -#, c-format +#, fuzzy, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Erreur d'écriture du fichier d'état temporaire %s" +msgstr "Erreur d'écriture du fichier %s" #: apt-pkg/tagfile.cc:102 #, c-format @@@ -2466,14 -2429,12 +2466,14 @@@ msgstr "Ligne %lu mal formée dans la li #: apt-pkg/sourcelist.cc:101 #, 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:108 #, 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:199 #, c-format @@@ -2493,14 -2454,12 +2493,14 @@@ msgstr "Ligne %u mal formée dans la lis #: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" +msgstr "" +"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, 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:399 #, c-format @@@ -2514,15 -2473,14 +2514,15 @@@ msgstr " "Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement " "le faire, activez l'option APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Le type de fichier d'index « %s » n'est pas accepté" #: apt-pkg/algorithms.cc:247 #, 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." @@@ -2596,8 -2554,7 +2596,8 @@@ msgstr "Impossible de localiser %s. #: apt-pkg/srcrecords.cc:44 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:69 msgid "The package lists or status file could not be parsed or opened." @@@ -2639,9 -2596,9 +2639,9 @@@ msgid "Error occurred while processing msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:153 -#, c-format -msgid "Error occured while processing %s (NewFileDesc1)" -msgstr "Erreur apparue lors du traitement de %s (NewFileDesc1)" +#, fuzzy, c-format - msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 #, c-format @@@ -2669,31 -2626,28 +2669,31 @@@ msgid "Error occurred while processing msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:245 -#, c-format -msgid "Error occured while processing %s (NewFileDesc2)" -msgstr "Erreur apparue lors du traitement de %s (NewFileVer2)" +#, fuzzy, c-format - msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 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 cette version d'APT est capable de " +"Vous avez dépassé le nombre de noms de paquets que cet APT est capable de " "traiter." #: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Vous avez dépassé le nombre de versions que cette version d'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:257 +#, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Vous avez dépassé le nombre de descriptions que cette version d'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:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Vous avez dépassé le nombre de dépendances que cette version d'APT est capable de " +"Vous avez dépassé le nombre de dépendances que cet APT est capable de " "traiter." #: apt-pkg/pkgcachegen.cc:288 @@@ -2724,25 -2678,23 +2724,25 @@@ msgstr "Assemblage des fichiers listés #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 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:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" -msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" +msgstr "" +"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2752,7 -2704,7 +2752,7 @@@ msgstr " "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2761,15 -2713,14 +2761,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, 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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Taille incohérente" @@@ -2819,11 -2770,11 +2819,11 @@@ msgid "Scanning disc for index files..\ msgstr "Examen du disque à la recherche de fichiers d'index...\n" #: apt-pkg/cdrom.cc:671 -#, c-format +#, fuzzy, c-format msgid "" "Found %i package indexes, %i source indexes, %i translation indexes and %i " "signatures\n" -msgstr "%i index de paquets trouvés, %i index de sources, %i index de traductions et %i signatures\n" +msgstr "%i index de paquets trouvés, %i index de sources et %i signatures\n" #: apt-pkg/cdrom.cc:708 #, c-format @@@ -2881,61 -2832,61 +2881,61 @@@ msgstr " "%i enregistrements écrits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Préparation de %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Décompression de %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Préparation de la configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s installé" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Préparation de la suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s supprimé" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Préparation de la suppression complète de %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s complètement supprimé" #: methods/rred.cc:219 +#, fuzzy msgid "Could not patch file" -msgstr "Impossible de corriger le fichier" +msgstr "Impossible de verrouiller %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" - diff --combined po/gl.po index 877916be7,24f896f26..a989b47ef --- a/po/gl.po +++ b/po/gl.po @@@ -1,13 -1,13 +1,13 @@@ # Galician translation of apt # This file is put in the public domain. -# Jacobo Tarrío , 2005, 2007. +# Jacobo Tarrío , 2005. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" -"PO-Revision-Date: 2007-06-18 15:26+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" +"PO-Revision-Date: 2007-02-28 13:14+0100\n" "Last-Translator: Jacobo Tarrío \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" @@@ -55,9 -55,8 +55,9 @@@ msgid "Total distinct versions: msgstr "Número total de versións distintas: " #: cmdline/apt-cache.cc:295 +#, fuzzy msgid "Total Distinct Descriptions: " -msgstr "Número total de descricións distintas: " +msgstr "Número total de versións distintas: " #: cmdline/apt-cache.cc:297 msgid "Total dependencies: " @@@ -68,9 -67,8 +68,9 @@@ msgid "Total ver/file relations: msgstr "Número total de relacións versión/ficheiro: " #: cmdline/apt-cache.cc:302 +#, fuzzy msgid "Total Desc/File relations: " -msgstr "Número total de relacións descrición/ficheiro: " +msgstr "Número total de relacións versión/ficheiro: " #: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " @@@ -159,7 -157,7 +159,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -235,7 -233,7 +235,7 @@@ msgstr " " -q Desactiva o indicador de progreso.\n" " -i Amosa só as dependencias importantes na orde unmet.\n" " -c=? Le este ficheiro de configuración.\n" -" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/" +" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" "Vexa as páxinas de manual de apt-cache(8) e apt.conf(5) para máis " "información.\n" @@@ -282,7 -280,7 +282,7 @@@ msgstr " "Opcións:\n" " -h Este texto de axuda.\n" " -c=? Le este ficheiro de configuración\n" -" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/" +" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" #: cmdline/apt-extracttemplates.cc:98 @@@ -310,9 -308,9 +310,9 @@@ msgstr " "\n" "Opcións:\n" " -h Este texto de axuda\n" -" -t Establece o directorio temporal\n" +" -t Estabrece o directorio temporal\n" " -c=? Le este ficheiro de configuración\n" -" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/" +" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 @@@ -431,7 -429,7 +431,7 @@@ msgstr " " --no-delink Activa o modo de depuración de desligado\n" " --contents Controla a xeración do ficheiro de contido\n" " -c=? Le este ficheiro de configuración\n" -" -o=? Establece unha opción de configuración" +" -o=? Estabrece unha opción de configuración" #: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" @@@ -664,7 -662,7 +664,7 @@@ msgstr "Non se puido cambiar o nome de msgid "Y" msgstr "S" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Erro na compilación da expresión regular - %s" @@@ -825,11 -823,11 +825,11 @@@ msgstr "Hai que eliminar paquetes pero msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, a ordeación non rematou" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Non se puido bloquear o directorio de descargas" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Non se puido ler a lista de orixes." @@@ -859,7 -857,7 +859,7 @@@ msgstr "Despois de desempaquetar hanse msgid "After unpacking %sB disk space will be freed.\n" msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non se puido determinar o espazo libre en %s" @@@ -888,7 -886,7 +888,7 @@@ msgstr " "Para continuar escriba a frase \"%s\"\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Abortar." @@@ -896,7 -894,7 +896,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non se puido obter %s %s\n" @@@ -905,7 -903,7 +905,7 @@@ msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" @@@ -1023,62 -1021,65 +1023,62 @@@ msgstr " #: cmdline/apt-get.cc:1433 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -"Non se supón que se deban eliminar cousas; non se pode iniciar o " -"autoeliminador" #: cmdline/apt-get.cc:1465 +#, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" -msgstr "" -"Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:" +msgstr "Os seguintes paquetes NOVOS hanse instalar:" #: cmdline/apt-get.cc:1467 msgid "Use 'apt-get autoremove' to remove them." -msgstr "Empregue \"apt-get autoremove\" para eliminalos." +msgstr "" #: cmdline/apt-get.cc:1472 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -"Hum, semella que o autoeliminadir destruiu algo, o que non debería\n" -"ter ocorrido. Envíe un informe de erro sobre apt." --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a resolver a situación:" #: cmdline/apt-get.cc:1479 +#, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "Erro interno, o autoeliminador rompeu cousas" +msgstr "Erro interno, o resolvedor interno rompeu cousas" #: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade rompeu cousas" --#: cmdline/apt-get.cc:1543 -#, c-format ++#: cmdline/apt-get.cc:1544 +#, fuzzy, c-format msgid "Couldn't find task %s" -msgstr "Non se puido atopar a tarefa %s" +msgstr "Non se puido atopar o paquete %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Non se puido atopar o paquete %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n" --#: cmdline/apt-get.cc:1711 -#, c-format ++#: cmdline/apt-get.cc:1712 +#, fuzzy, c-format msgid "%s set to manual installed.\n" -msgstr "%s cambiado a instalado manualmente.\n" +msgstr "pero hase instalar %s" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1086,7 -1087,7 +1086,7 @@@ msgstr " "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou " "especifique unha solución)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1097,7 -1098,7 +1097,7 @@@ msgstr " "unha situación imposible ou, se emprega a distribución inestable, que\n" "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1106,133 -1107,118 +1106,133 @@@ msgstr " "Xa que só solicitou unha soa operación, é bastante probable que o\n" "paquete non sea instalable e que se deba informar dun erro no paquete." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Paquetes rotos" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Hanse instalar os seguintes paquetes extra:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Paquetes suxiridos:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Paquetes recomendados:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "A calcular a actualización... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fallou" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Rematado" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o resolvedor interno rompeu cousas" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "" "Ten que especificar alomenos un paquete para lle descargar o código fonte" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Non se puido atopar un paquete fonte para %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado \"%s\"\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre de abondo en %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai que recibir %sB de arquivos de fonte.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Non se puido recibir algúns arquivos." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetamento \"%s\".\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a codificación de %s.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "O proceso fillo fallou" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar alomenos un paquete para lle comprobar as dependencias " "de compilación" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non se puido obter a información de dependencias de compilación de %s" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1241,7 -1227,7 +1241,7 @@@ msgstr " "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " "o paquete %s" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1250,33 -1236,32 +1250,33 @@@ msgstr " "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión " "dispoñible do paquete %s satisfai os requirimentos de versión" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é " "novo de máis" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de compilación de %s." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Non se puido procesar as dependencias de compilación" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Módulos soportados:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1332,32 -1317,34 +1332,32 @@@ msgstr " " install - Instala novos paquetes (o paquete chámase libc6, non libc6." "deb)\n" " remove - Elimina paquetes\n" -" purge - Elimina e purga paquetes\n" " source - Descarga arquivos de código fonte\n" " build-dep - Configura as dependencias de compilación dos paquetes fonte\n" -" dist-upgrade - Actualiza a distribución, consulte apt-get(8)\n" -" dselect-upgrade - Segue as seleccións de dselect\n" +" dist-upgrade - Actualiza a distribución, vexa apt-get(8)\n" +" dselect-upgrade - Sigue as seleccións de dselect\n" " clean - Borra os arquivos descargados\n" " autoclean - Borra os arquivos antigos descargados\n" -" check - Comproba que non haxa dependencias rotas\n" +" check - Verifica que non hai dependencias rotas\n" "\n" "Opcións:\n" " -h Este texto de axuda.\n" " -q Saída que se pode rexistrar - sen indicador de progreso\n" -" -qq Sen saída agás polos erros\n" +" -qq Sen saída agás os erros\n" " -d Só descarga - NON instala nin desempaqueta os arquivos\n" " -s No-act. Realiza unha simulación de ordeamento\n" -" -y Supón unha resposta afirmativa a tódalas preguntas sen amosalas\n" +" -y Supón \"Sí\" a tódalas preguntas e non as amosa\n" " -f Tenta continuar se a comprobación de integridade falla\n" " -m Tenta continuar se non se poden localizar os arquivos\n" " -u Tamén amosa unha lista de paquetes actualizados\n" " -b Constrúe o paquete fonte despois de o descargar\n" " -V Amosa números detallados de versión\n" " -c=? Le este ficheiro de configuración\n" -" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/" +" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -"Consulte as páxinas de manual apt-get(8), sources.list(5) e apt.conf(5) " -"para\n" -"máis información e opcións.\n" -" Este APT ten Poderes de Supervaca.\n" +"Vexa as páxinas de manual apt-get(8), sources.list(5) e apt.conf(5) para\n" +"ver máis información e opcións.\n" +" Este APT ten Poderes de Super Vaca.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " @@@ -1422,7 -1409,7 +1422,7 @@@ msgstr " " -h Este texto de axuda\n" " -s Emprega ordeamento por ficheiros fonte\n" " -c=? Le este ficheiro de configuración\n" -" -o=? Establece unha opción de configuración; por exemplo, -o dir::cache=/" +" -o=? Estabrece unha opción de configuración; por exemplo, -o dir::cache=/" "tmp\n" #: dselect/install:32 @@@ -1585,9 -1572,9 +1585,9 @@@ msgstr "Coincidencia na sobrescritura s msgid "File %s/%s overwrites the one in the package %s" msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Non se pode ler %s" @@@ -1887,7 -1874,7 +1887,7 @@@ msgstr "A conexión do socket de datos msgid "Unable to accept connection" msgstr "Non se pode aceptar a conexión" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@@ -1914,39 -1901,39 +1914,39 @@@ msgstr "Petición msgid "Unable to invoke " msgstr "Non se puido chamar a " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "A conectar a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Non se puido crear un socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Non se pode iniciar a conexión a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Non se puido conectar a %s:%s (%s), a conexión esgotou o tempo" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Non se puido conectar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "A conectar a %s" @@@ -2025,76 -2012,76 +2025,76 @@@ msgstr "Non se puido abrir unha canle p msgid "Read error from %s process" msgstr "Erro de lectura do proceso %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "A agardar polas cabeceiras" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Liña de cabeceira incorrecta" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP ten un soporte de rangos roto" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data descoñecido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro ao escribir no ficheiro de saída" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro ao escribir nun ficheiro" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro ao escribir no ficheiro" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "A conexión fallou" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Erro interno" @@@ -2112,57 -2099,57 +2112,57 @@@ msgstr "Non se puido facer mmap de %lu msgid "Selection %s not found" msgstr "Non se atopou a selección %s" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo \"%c\" descoñecida" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "A abrir o ficheiro de configuración %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Liña %d longa de máis (máximo %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: O bloque comeza sen un nome." --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Etiqueta mal formada" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra despois do valor" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Erro de sintaxe %s:%u: Só se poden facer directivas no nivel superior" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Includes aniñados de máis" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído de aquí" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\"" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña" @@@ -2230,7 -2217,6 +2230,7 @@@ msgid "Unable to stat the mount point % msgstr "Non se pode analizar o punto de montaxe %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Non se pode cambiar a %s" @@@ -2357,7 -2343,7 +2357,7 @@@ msgstr "Fai obsoleto a #: apt-pkg/pkgcache.cc:226 msgid "Breaks" -msgstr "Rompe" +msgstr "" #: apt-pkg/pkgcache.cc:237 msgid "important" @@@ -2392,19 -2378,18 +2392,19 @@@ msgid "Dependency generation msgstr "Xeración de dependencias" #: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy msgid "Reading state information" -msgstr "A ler a información do estado" +msgstr "A mesturar a información sobre paquetes dispoñibles" #: apt-pkg/depcache.cc:198 -#, c-format +#, fuzzy, c-format msgid "Failed to open StateFile %s" -msgstr "Non se puido abrir o ficheiro de estado %s" +msgstr "Non se puido abrir %s" #: apt-pkg/depcache.cc:204 -#, c-format +#, fuzzy, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Non se puido gravar o ficheiro de estado temporal %s" +msgstr "Non se puido gravar o ficheiro %s" #: apt-pkg/tagfile.cc:102 #, c-format @@@ -2477,7 -2462,7 +2477,7 @@@ msgstr " "%s debido a un bucle de Conflictos e Pre-dependencias. Isto adoita ser malo, " "pero se o quere facer, active a opción APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "O tipo de ficheiros de índices \"%s\" non está soportado" @@@ -2596,9 -2581,9 +2596,9 @@@ msgid "Error occurred while processing msgstr "Ocorreu un erro ao procesar %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:153 -#, c-format -msgid "Error occured while processing %s (NewFileDesc1)" -msgstr "Ocorreu un erro ao procesar %s (NewFileDesc1)" +#, fuzzy, c-format - msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 #, c-format @@@ -2626,9 -2611,9 +2626,9 @@@ msgid "Error occurred while processing msgstr "Ocorreu un erro ao procesar %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:245 -#, c-format -msgid "Error occured while processing %s (NewFileDesc2)" -msgstr "Ocorreu un erro ao procesar %s (NewFileDesc2)" +#, fuzzy, c-format - msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." @@@ -2639,9 -2624,8 +2639,9 @@@ msgid "Wow, you exceeded the number of msgstr "Guau, superou o número de versións que este APT pode manexar." #: apt-pkg/pkgcachegen.cc:257 +#, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Guau, superou o número de descricións que este APT pode manexar." +msgstr "Guau, superou o número de versións que este APT pode manexar." #: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." @@@ -2675,22 -2659,22 +2675,22 @@@ msgstr "A recoller as provisións de fi msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar a caché de fontes" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "fallou o cambio de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Os MD5Sum non coinciden" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2699,7 -2683,7 +2699,7 @@@ msgstr " "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falla a arquitectura)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2708,7 -2692,7 +2708,7 @@@ msgstr " "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2716,7 -2700,7 +2716,7 @@@ msgstr " "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@@ -2766,17 -2750,18 +2766,17 @@@ msgid "Scanning disc for index files..\ msgstr "A buscar os ficheiros de índices no disco..\n" #: apt-pkg/cdrom.cc:671 -#, c-format +#, fuzzy, c-format msgid "" "Found %i package indexes, %i source indexes, %i translation indexes and %i " "signatures\n" msgstr "" -"Atopáronse %i índices de paquetes, %i índices de fontes, %i índices de " -"traducións e %i sinaturas\n" +"Atopáronse %i índices de paquetes, %i índices de fontes e %i sinaturas\n" #: apt-pkg/cdrom.cc:708 -#, c-format +#, fuzzy, c-format msgid "Found label '%s'\n" -msgstr "Atopouse a etiqueta \"%s\"\n" +msgstr "Etiqueta armacenada: %s \n" #: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" @@@ -2804,9 -2789,8 +2804,9 @@@ msgid "Source list entries for this dis msgstr "As entradas da lista de fontes deste disco son:\n" #: apt-pkg/cdrom.cc:834 +#, fuzzy msgid "Unmounting CD-ROM...\n" -msgstr "A desmontar o CD-ROM...\n" +msgstr "A desmontar o CD-ROM..." #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format @@@ -2830,52 -2814,52 +2830,52 @@@ msgstr " "Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non " "coinciden\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "A desempaquetar %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "A se preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Instalouse %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "A se preparar para a eliminación de %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "A eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Eliminouse %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "A se preparar para eliminar %s completamente" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Eliminouse %s completamente" diff --combined po/he.po index f4029b9c6,df7e107ff..f4a800ab5 --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@@ -156,7 -156,7 +156,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -554,7 -554,7 +554,7 @@@ msgstr "כשלון בשינוי השם msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "" @@@ -717,11 -717,11 +717,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "לא מצליח לנעול את ספרית ההורדה." - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "רשימת המקורות לא ניתנת לקריאה." @@@ -750,7 -750,7 +750,7 @@@ msgstr "אחרי פריסה %sB × ×•×¡× msgid "After unpacking %sB disk space will be freed.\n" msgstr "אחרי פריסה %sB נוספים ישוחררו.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "אין לך מספיק מקום פנוי ב-%s." @@@ -776,7 -776,7 +776,7 @@@ msgid " " ?] " msgstr "" - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "בטל." @@@ -785,7 -785,7 +785,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/n]" - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "כשלון בהבאת %s %s\n" @@@ -794,7 -794,7 +794,7 @@@ msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד." @@@ -921,7 -921,7 +921,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "" @@@ -934,37 -934,37 +934,37 @@@ msgstr "שגיאה פנימית, כלש msgid "Internal error, AllUpgrade broke stuff" msgstr "" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, c-format msgid "Couldn't find task %s" msgstr "" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "אבל %s הולכת להיות מותקנת" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -972,175 -972,160 +972,175 @@@ "or been moved out of Incoming." msgstr "" --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "שגיאה פנימית, כלשון ביצירת %s" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, 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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1394,9 -1379,9 +1394,9 @@@ msgstr " msgid "File %s/%s overwrites the one in the package %s" msgstr "" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "" @@@ -1689,7 -1674,7 +1689,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@@ -1716,39 -1701,39 +1716,39 @@@ msgstr " msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" @@@ -1821,76 -1806,76 +1821,76 @@@ msgstr " msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "" @@@ -1908,57 -1893,57 +1908,57 @@@ msgstr " msgid "Selection %s not found" msgstr "" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "" --#: apt-pkg/contrib/configuration.cc:509 ++#: apt-pkg/contrib/configuration.cc:510 #, c-format --msgid "Line %d too long (max %d)" ++msgid "Line %d too long (max %lu)" msgstr "" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@@ -2025,7 -2010,6 +2025,7 @@@ msgid "Unable to stat the mount point % msgstr "" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "" @@@ -2268,7 -2252,7 +2268,7 @@@ msgid " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" @@@ -2381,7 -2365,7 +2381,7 @@@ msgstr " #: apt-pkg/pkgcachegen.cc:153 #, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" #: apt-pkg/pkgcachegen.cc:178 @@@ -2411,7 -2395,7 +2411,7 @@@ msgstr " #: apt-pkg/pkgcachegen.cc:245 #, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" #: apt-pkg/pkgcachegen.cc:251 @@@ -2458,41 -2442,41 +2458,41 @@@ msgstr " msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, 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:1278 +#: apt-pkg/acquire-item.cc:1329 #, 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:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "" @@@ -2598,52 -2582,52 +2598,52 @@@ msgstr " msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, fuzzy, c-format msgid "Installed %s" msgstr "מותקן:" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "" diff --combined po/hu.po index b92385488,251e3e6b5..c1c58e2fa --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-21 11:04+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" @@@ -161,7 -161,7 +161,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -658,7 -658,7 +658,7 @@@ msgstr "Nem sikerült átnevezni %s-t e msgid "Y" msgstr "I" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@@ -819,11 -819,11 +819,11 @@@ msgstr "Csomagokat kellene eltávolíta msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem zárult" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." @@@ -852,7 -852,7 +852,7 @@@ msgstr "Kicsomagolás után %sB lemezte msgid "After unpacking %sB disk space will be freed.\n" msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" @@@ -881,7 -881,7 +881,7 @@@ msgstr " "A folytatáshoz írd be ezt: '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Megszakítva." @@@ -889,7 -889,7 +889,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" @@@ -898,7 -898,7 +898,7 @@@ msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" @@@ -1031,7 -1031,7 +1031,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információ segíthet megoldani a helyzetet:" @@@ -1044,31 -1044,31 +1044,31 @@@ msgstr "Belső hiba, hibafeloldó gond msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Az alábbi csomag nem található: %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "de csak %s telepíthető" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1076,7 -1076,7 +1076,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:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1088,7 -1088,7 +1088,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1098,133 -1098,118 +1098,133 @@@ msgstr " "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Törött csomagok" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Javasolt csomagok:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Sikertelen" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Kész" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, hibafeloldó gond" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött '%s' fájl kihagyása\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrás-archívumot kell letölteni.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrás-archívumot kell letölteni.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, 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:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1233,7 -1218,7 +1233,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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1242,32 -1227,32 +1242,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Támogatott modulok:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1572,9 -1557,9 +1572,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "%s nem olvasható" @@@ -1873,7 -1858,7 +1873,7 @@@ msgstr "Az adat sockethez kapcsolódá msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@@ -1900,39 -1885,39 +1900,39 @@@ msgstr "Lekérdezés msgid "Unable to invoke " msgstr "Nem lehet meghívni " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Csatlakozás: %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "socket létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kapcsolódás: %s" @@@ -2005,76 -1990,76 +2005,76 @@@ msgstr "Nem lehet csövet nyitni ehhez msgid "Read error from %s process" msgstr "Olvasási hiba %s folyamattól" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Várakozás a fejlécekre" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Rossz fejléc sor" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ez a http szerver támogatja a sérült tartományokat " -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Belső hiba" @@@ -2093,57 -2078,57 +2093,57 @@@ msgstr "Nem sikerült %lu bájtot mmap- msgid "Selection %s not found" msgstr "%s kiválasztás nem található" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ismeretlen típusrövidítés: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurációs fájl megnyitása" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "A(z) %d. sor túl hosszú (maximum %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, 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:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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" @@@ -2211,7 -2196,6 +2211,7 @@@ msgid "Unable to stat the mount point % msgstr "%s csatolási pont nem érhető el" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Nem sikerült ide váltani: %s" @@@ -2458,7 -2442,7 +2458,7 @@@ msgstr " "alapvető csomagot ami Ütközési/Elő-függőségi hurkot okoz. Ez gyakran rossz, " "de ha tényleg ezt akarod tenni, aktiváld az APT::Force-LoopBreak opciót." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "A(z) '%s' indexfájltípus nem támogatott" @@@ -2575,8 -2559,8 +2575,8 @@@ msgid "Error occurred while processing msgstr "Hiba történt %s feldolgozásakor (UsePackage1)" #: apt-pkg/pkgcachegen.cc:153 --#, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++#, fuzzy, c-format ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2605,8 -2589,8 +2605,8 @@@ msgid "Error occurred while processing msgstr "Hiba történt %s feldolgozásakor (NewVersion2)" #: apt-pkg/pkgcachegen.cc:245 --#, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++#, fuzzy, c-format ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2659,21 -2643,21 +2659,21 @@@ msgstr "\"Előkészít\" kapcsolatok ö msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2682,7 -2666,7 +2682,7 @@@ msgstr " "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2691,14 -2675,14 +2691,14 @@@ msgstr " "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, 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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@@ -2809,52 -2793,52 +2809,52 @@@ msgstr "%i rekord kiírva %i hibásan p 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s előkészítése" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s kicsomagolása" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "%s konfigurálásának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "%s konfigurálása" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Telepített %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "%s eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s eltávolítása" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Eltávolított %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "%s teljes eltávolítása előkészítése" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" diff --combined po/it.po index d0cb1a760,49fe11821..1d47847ab --- a/po/it.po +++ b/po/it.po @@@ -5,7 -5,7 +5,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-12 09:27+0200\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@@ -157,7 -157,7 +157,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -657,7 -657,7 +657,7 @@@ msgstr "Impossibile rinominare %s in %s msgid "Y" msgstr "S" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione della regex - %s" @@@ -821,11 -821,11 +821,11 @@@ msgstr "I pacchetti devono essere rimos msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non è terminato" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non può essere letta." @@@ -856,7 -856,7 +856,7 @@@ msgstr "Dopo l'estrazione, verranno occ 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:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero su %s" @@@ -887,7 -887,7 +887,7 @@@ msgstr " "Per continuare scrivere la frase '%s' \n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Interrotto." @@@ -895,7 -895,7 +895,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" @@@ -904,7 -904,7 +904,7 @@@ msgid "Some files failed to download" msgstr "Il download di alcuni file è fallito" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Download completato e in modalità download-only" @@@ -1040,7 -1040,7 +1040,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " @@@ -1053,32 -1053,32 +1053,32 @@@ msgstr "Errore interno, problem resolve msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Impossibile trovare %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "ma %s sta per essere installato" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1086,7 -1086,7 +1086,7 @@@ msgstr " "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1098,7 -1098,7 +1098,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1108,132 -1108,117 +1108,132 @@@ msgstr " "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Pacchetto non integro" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fallito" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Fatto" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, problem resolver ha rotto qualcosa" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Si è saltato il file già scaricato '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non è sufficiente" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario prendere %sB/%sB di sorgenti.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario prendere %sB di sorgenti\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Non è stato possibile scaricare alcuni archivi." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare se il pacchetto 'dpkg-dev' è installato.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Processo figlio fallito" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1242,7 -1227,7 +1242,7 @@@ msgstr " "%s dipendenze per %s non possono essere soddisfatte perché non si trova il " "pacchetto %s" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1251,32 -1236,32 +1251,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s è fallita" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione è fallito" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Moduli supportati:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1593,9 -1578,9 +1593,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" @@@ -1895,7 -1880,7 +1895,7 @@@ msgstr "Tempo limite di connessione esa msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@@ -1922,40 -1907,40 +1922,40 @@@ msgstr "Query msgid "Unable to invoke " msgstr "Impossibile invocare " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Connessione a %s (%s) in corso" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossibile iniziare la connessione a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s in corso" @@@ -2033,77 -2018,77 +2033,77 @@@ msgstr "Impossibile aprire una pipe pe msgid "Read error from %s process" msgstr "Errore di lettura dal processo %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Si è ottenuto una singola linea di header su %u caratteri" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linea nell'header non corretta" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Il server HTTP ha inviato un header di risposta non valido" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Il server HTTP ha inviato un Content-Length non valido" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Il server HTTP ha inviato un Content-Range non valido" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Questo server HTTP ha il supporto del range bacato" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Errore interno" @@@ -2121,59 -2106,59 +2121,59 @@@ msgstr "Impossibile eseguire mmap di %l msgid "Selection %s not found" msgstr "Selezione %s non trovata" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo di abbreviazione non riconosciuto: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Apertura del file di configurazione %s in corso" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Linea %d troppo lunga (max %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Errore di sintassi %s:%u: Tag malformato" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Errore di sintassi %s:%u: Incluso da qui" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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" @@@ -2242,7 -2227,6 +2242,7 @@@ msgid "Unable to stat the mount point % msgstr "Impossibile accedere al mount point %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Impossibile raggiungere %s" @@@ -2490,7 -2474,7 +2490,7 @@@ msgstr " "essenziale %s a causa di un loop Conflitto/Pre-Dipendenza. Questo non è " "bene, ma se si vuole farlo, si attivi l'opzione APT::Force-LoopBreak " -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Il file indice di tipo '%s' non è supportato" @@@ -2610,7 -2594,7 +2610,7 @@@ msgstr "Errore nell'analisi di %s (UseP #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Errore nell'analisi di %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2640,7 -2624,7 +2640,7 @@@ msgstr "Errore nell'analisi di %s (NewV #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Errore nell'analisi di %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2697,22 -2681,22 +2697,22 @@@ msgstr "Il File Collezionato Fornisce msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvataggio del cache sorgente" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2722,7 -2706,7 +2722,7 @@@ msgstr " "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2731,7 -2715,7 +2731,7 @@@ msgstr " "Non è stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2739,7 -2723,7 +2739,7 @@@ msgstr " "I file indice dei pacchetti sono corrotti. Non c'è un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" @@@ -2850,52 -2834,52 +2850,52 @@@ 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Preparazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Scompattamento di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Preparazione alla configurazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Configurazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s Installato" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Preparazione per la rimozione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Rimozione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s rimosso" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparazione alla rimozione totale di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Rimozione totale completata %s" diff --combined po/ja.po index 4e5055a6c,30e683bd7..8728f996b --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-09-08 19:57+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@@ -159,7 -159,7 +159,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -657,7 -657,7 +657,7 @@@ msgstr "%s を %s に名前変更でき msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@@ -820,11 -820,11 +820,11 @@@ msgstr "パッケージを削除しなã msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "ソースのリストを読むことができません。" @@@ -854,7 -854,7 +854,7 @@@ msgstr "展開後に追加で %sB のムmsgid "After unpacking %sB disk space will be freed.\n" msgstr "展開後に %sB のディスク容量が解放されます。\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" @@@ -883,7 -883,7 +883,7 @@@ msgstr " "続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "中断しました。" @@@ -891,7 -891,7 +891,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" @@@ -900,7 -900,7 +900,7 @@@ msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" @@@ -1036,7 -1036,7 +1036,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" @@@ -1049,33 -1049,33 +1049,33 @@@ msgstr "内部エラー、問題リゾã msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "パッケージ %s が見つかりません" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "しかし、%s はインストールされようとしています" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1083,7 -1083,7 +1083,7 @@@ msgstr " "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1095,7 -1095,7 +1095,7 @@@ msgstr " "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1105,133 -1105,118 +1105,133 @@@ msgstr " "可能性が高いです。そのため、このパッケージへのバグレポートを送ってくだ\n" "さい。" --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "壊れたパッケージ" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "提案パッケージ:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "推奨パッケージ:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "失敗" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "完了" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "子プロセスが失敗しました" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1240,7 -1225,7 +1240,7 @@@ msgstr " "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1249,32 -1234,32 +1249,32 @@@ msgstr " "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対" "する %1$s の依存関係を満たすことができません" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "サポートされているモジュール:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1584,9 -1569,9 +1584,9 @@@ msgstr "%s に対するバージョンã msgid "File %s/%s overwrites the one in the package %s" msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "%s を読み込むことができません" @@@ -1887,7 -1872,7 +1887,7 @@@ msgstr "データソケット接続タã msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@@ -1914,39 -1899,39 +1914,39 @@@ msgstr "問い合わせ msgid "Unable to invoke " msgstr "呼び出せません" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) へ接続しています" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s) への接続を開始できません。" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s へ接続しています" @@@ -2020,76 -2005,76 +2020,76 @@@ msgstr "%s に対してパイプを開ã msgid "Read error from %s process" msgstr "%s プロセスからの読み込みエラー" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "ヘッダの待機中です" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "%u 文字を超える 1 行のヘッダを取得しました" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "不正なヘッダ行です" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http サーバが不正なリプライヘッダを送信してきました" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http サーバが不正な Content-Length ヘッダを送信してきました" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http サーバが不正な Content-Range ヘッダを送信してきました" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http サーバのレンジサポートが壊れています" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "内部エラー" @@@ -2107,57 -2092,57 +2107,57 @@@ msgstr "%lu バイトの mmap ができ msgid "Selection %s not found" msgstr "選択された %s が見つかりません" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "理解できない省略形式です: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "設定ファイル %s をオープンできませんでした" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "%d 行目が長すぎます (最大 %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。" --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "文法エラー %s:%u: 不正なタグです" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "文法エラー %s:%u: インクルードのネストが多すぎます" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "文法エラー %s:%u: ここからインクルードされています" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "文法エラー %s:%u: 未対応の命令 '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります" @@@ -2224,7 -2209,6 +2224,7 @@@ msgid "Unable to stat the mount point % msgstr "マウントポイント %s の状態を取得できません" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "%s へ変更することができません" @@@ -2471,7 -2455,7 +2471,7 @@@ msgstr " "ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に" "これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "インデックスファイルのタイプ '%s' はサポートされていません" @@@ -2596,7 -2580,7 +2596,7 @@@ msgstr "%s を処理中にエラーがç #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2626,7 -2610,7 +2626,7 @@@ msgstr "%s を処理中にエラーがç #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2674,21 -2658,21 +2674,21 @@@ msgstr "ファイル提供情報を収é msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "名前の変更に失敗しました。%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2697,7 -2681,7 +2697,7 @@@ msgstr " "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2706,7 -2690,7 +2706,7 @@@ msgstr " "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2714,7 -2698,7 +2714,7 @@@ msgstr " "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "サイズが適合しません" @@@ -2829,52 -2813,52 +2829,52 @@@ msgstr " "%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない" "ファイルがあります。\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s を準備しています" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s を展開しています" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "%s の設定を準備しています" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "%s を設定しています" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s をインストールしました" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "%s の削除を準備しています" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s を削除しています" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s を削除しました" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "%s を完全に削除する準備をしています" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s を完全に削除しました" diff --combined po/ko.po index f07a22ee0,ce4dee022..16d87bef9 --- a/po/ko.po +++ b/po/ko.po @@@ -5,7 -5,7 +5,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-12 21:22-0400\n" "Last-Translator: Sunjae Park \n" "Language-Team: Korean \n" @@@ -156,7 -156,7 +156,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -654,7 -654,7 +654,7 @@@ msgstr "%s 파일의 이름을 %s(으)ë msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@@ -816,11 -816,11 +816,11 @@@ msgstr "꾸러미를 지워야 í•˜ì§€ë§ msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "내려받기 디렉토리를 잠글 수 없습니다" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." @@@ -851,7 -851,7 +851,7 @@@ msgstr "압축을 풀면 %së°”ì´íŠ¸ì msgid "After unpacking %sB disk space will be freed.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" @@@ -883,7 -883,7 +883,7 @@@ msgstr " "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "중단." @@@ -891,7 -891,7 +891,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" @@@ -900,7 -900,7 +900,7 @@@ msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다" @@@ -1035,7 -1035,7 +1035,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" @@@ -1048,32 -1048,32 +1048,32 @@@ msgstr "내부 오류, 문제 해결 í” msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "%s 꾸러미를 찾을 수 없습니다" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "%s 꾸러미를 찾을 수 없습니다" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "하지만 %s 꾸러미를 설치할 것입니다" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1081,7 -1081,7 +1081,7 @@@ msgstr " "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1092,7 -1092,7 +1092,7 @@@ msgstr " "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1101,130 -1101,115 +1101,130 @@@ msgstr " "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n" "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "망가진 꾸러미" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "다음 꾸러미를 더 설치할 것입니다:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "실패" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "완료" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 꾸러미를 찾을 수 없습니다" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 꾸러미가 설치되었는지를 확인해주십시오.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1233,7 -1218,7 +1233,7 @@@ msgstr " "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" "다" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1242,32 -1227,32 +1242,32 @@@ msgstr " "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "지원하는 모듈:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1574,9 -1559,9 +1574,9 @@@ msgstr "덮어 쓰는 꾸러미가 %s ê msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s 파일은 %s 꾸러미에 있는 파일을 덮어 씁니다" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" @@@ -1874,7 -1859,7 +1874,7 @@@ msgstr "데이터 소켓 연결 시간 msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@@ -1901,39 -1886,39 +1901,39 @@@ msgstr "질의 msgid "Unable to invoke " msgstr "다음을 실행할 수 없습니다: " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s에 대한 소켓을 만들 수 없습니다 (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" @@@ -2005,76 -1990,76 +2005,76 @@@ msgstr "%s에 대한 파이프를 열 ì msgid "Read error from %s process" msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "헤더를 기다리는 중입니다" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "헤더 줄이 잘못되었습니다" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "내부 오류" @@@ -2092,57 -2077,57 +2092,57 @@@ msgstr "%lu바이트를 mmap할 수 없 msgid "Selection %s not found" msgstr "선택한 %s이(가) 없습니다" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "이 타입 줄임말을 알 수 없습니다: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "설정 파일 %s 파일을 여는 중입니다" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "%d번 줄이 너무 깁니다 (최대 %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다." --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "문법 오류 %s:%u: 여기서 include됩니다" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다" @@@ -2209,7 -2194,6 +2209,7 @@@ msgid "Unable to stat the mount point % msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "%s 디렉토리로 이동할 수 없습니다" @@@ -2456,7 -2440,7 +2456,7 @@@ msgstr " "잠깐 지워야 합니다. 이 꾸러미를 지우는 ê±´ 좋지 않지만, 정말 지우려면 APT::" "Force-LoopBreak 옵션을 켜십시오." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다" @@@ -2573,7 -2557,7 +2573,7 @@@ msgstr "%s 처리하는 중에 ì˜¤ë¥˜ê° #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2603,7 -2587,7 +2603,7 @@@ msgstr "%s 처리하는 중에 ì˜¤ë¥˜ê° #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2651,21 -2635,21 +2651,21 @@@ msgstr "파일에서 제공하는 ê²ƒì msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2674,7 -2658,7 +2674,7 @@@ msgstr " "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2683,14 -2667,14 +2683,14 @@@ msgstr " "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@@ -2801,52 -2785,52 +2801,52 @@@ msgstr "레코드 %i개를 파일 %i개 msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s 준비 중" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s을(를) 푸는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "%s을(를) 설정할 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "%s 설정 중" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s 설치했음" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "%s을(를) 삭제할 준비 중" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s 지우는 중" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s 지움" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "%s을(를) 완전히 지울 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s을(를) 완전히 지웠습니다" diff --combined po/nb.po index 69a3ee44b,c68a80aaa..12b7a3500 --- a/po/nb.po +++ b/po/nb.po @@@ -15,7 -15,7 +15,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-16 00:35+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmal \n" @@@ -168,7 -168,7 +168,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -667,7 -667,7 +667,7 @@@ msgstr "Klarte ikke å endre navnet på % msgid "Y" msgstr "J" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" @@@ -828,11 -828,11 +828,11 @@@ msgstr "Pakker trenges å fjernes, men f msgid "Internal error, Ordering didn't finish" msgstr "Intern feil, sortering fullførte ikke" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." @@@ -863,7 -863,7 +863,7 @@@ msgstr "Etter utpakking vil %sB ekstra msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" @@@ -893,7 -893,7 +893,7 @@@ msgstr " "For å fortsette skriv inn teksten «%s»\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Avbryter." @@@ -901,7 -901,7 +901,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" @@@ -910,7 -910,7 +910,7 @@@ msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" @@@ -1045,7 -1045,7 +1045,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" @@@ -1058,31 -1058,31 +1058,31 @@@ msgstr "Intern feil, problemløser ødel msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Klarte ikke å finne pakken %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "men %s skal installeres" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1090,7 -1090,7 +1090,7 @@@ msgstr " "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1102,7 -1102,7 +1102,7 @@@ msgstr " "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1112,137 -1112,122 +1112,137 @@@ msgstr " "at pakken helt enkelt ikke kan installeres, og du bør fylle ut en " "feilmelding." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Ødelagte pakker" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Anbefalte pakker" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislyktes" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Utført" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemløser ødela noe" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil «%s»\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken «dpkg-dev» er installert.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Barneprosessen mislyktes" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, 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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1251,32 -1236,32 +1251,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Støttede moduler:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1585,9 -1570,9 +1585,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke å lese %s" @@@ -1890,7 -1875,7 +1890,7 @@@ msgstr "Tidsavbrudd på tilkoblingen ti msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@@ -1917,39 -1902,39 +1917,39 @@@ msgstr "Spørring msgid "Unable to invoke " msgstr "Klarte ikke å starte" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Kobler til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Klarte ikke å opprette en sokkel for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" @@@ -2024,76 -2009,76 +2024,76 @@@ msgstr "Klarte ikke å åpne rør for %s msgid "Read error from %s process" msgstr "Lesefeil fra %s-prosessen" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Venter på hoder" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fikk en enkel hodelinje over %u tegn" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Ødelagt hodelinje" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tjeneren sendte et ugyldig svarhode" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tjeneren har ødelagt støtte for område" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsavbrudd på forbindelsen" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Ødelagte hodedata" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Intern feil" @@@ -2111,57 -2096,57 +2111,57 @@@ msgstr "Kunne ikke lage mmap av %lu byt msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjent typeforkortelse: «%c»" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Åpner oppsettsfila %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Linje %d er for lang (maks %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Feil på taggen" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herfra" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila" @@@ -2228,7 -2213,6 +2228,7 @@@ msgid "Unable to stat the mount point % msgstr "Klarer ikke å fastsette monteringspunktet %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Klarer ikke å endre %s" @@@ -2475,7 -2459,7 +2475,7 @@@ msgstr " "s pga. en konflikt/forutsettelses-løkke. Dette er ofte stygt, men hvis du " "virkelig vil det, så bruk innstillingen APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Oversiktsfil av typen «%s» støttes ikke" @@@ -2593,7 -2577,7 +2593,7 @@@ msgstr "Feil oppsto under behandling a #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Feil oppsto under behandling av %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2623,7 -2607,7 +2623,7 @@@ msgstr "Feil oppsto under behandling a #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Feil oppsto under behandling av %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2671,22 -2655,22 +2671,22 @@@ msgstr "Samler inn filtilbud msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke å endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2695,7 -2679,7 +2695,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2704,13 -2688,13 +2704,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, 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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Feil størrelse" @@@ -2821,52 -2805,52 +2821,52 @@@ 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Forbereder %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Pakker ut %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Forbereder konfigurering %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Konfigurer %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Installerte %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Forbereder fjerning av %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Fjernet %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Forbereder å fullstendig slette %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Fjernet %s fullstendig" diff --combined po/nl.po index 6cd713905,05b1bbe6a..96c360d1f --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-17 22:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@@ -158,7 -158,7 +158,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -662,7 -662,7 +662,7 @@@ msgstr "Hernoemen van %s naar %s is mis msgid "Y" msgstr "J" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@@ -824,11 -824,11 +824,11 @@@ msgstr "Pakketten moeten verwijderd wor msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." @@@ -859,7 -859,7 +859,7 @@@ msgstr "Na het uitpakken zal er %sB ext msgid "After unpacking %sB disk space will be freed.\n" msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" @@@ -888,7 -888,7 +888,7 @@@ msgstr " "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Afbreken." @@@ -896,7 -896,7 +896,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" @@@ -905,7 -905,7 +905,7 @@@ msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" @@@ -1042,7 -1042,7 +1042,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" @@@ -1055,33 -1055,33 +1055,33 @@@ msgstr "Interne fout, probleemoplosser msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Kon pakket %s niet vinden" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "maar %s zal geïnstalleerd worden" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1089,7 -1089,7 +1089,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:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1100,7 -1100,7 +1100,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1110,134 -1110,119 +1110,134 @@@ msgstr " "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Niet-werkende pakketten:" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislukt" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Klaar" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Dochterproces is mislukt" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1246,7 -1231,7 +1246,7 @@@ msgstr " "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1255,32 -1240,32 +1255,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Ondersteunde modules:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1598,9 -1583,9 +1598,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" @@@ -1903,7 -1888,7 +1903,7 @@@ msgstr "Datasocket verbinding is verlop msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@@ -1930,39 -1915,39 +1930,39 @@@ msgstr "Zoekopdracht msgid "Unable to invoke " msgstr "Aanroepen mislukt van " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan de verbinding met %s:%s (%s) niet aangaan." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" @@@ -2042,79 -2027,79 +2042,79 @@@ msgstr "Kon geen pijp openen voor %s msgid "Read error from %s process" msgstr "Leesfout door proces %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Wachtend op de kopteksten" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Foute koptekstregel" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Interne fout" @@@ -2132,59 -2117,59 +2132,59 @@@ msgstr "Kon van %lu bytes geen mmap mak msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Onbekende typeafkorting '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Configuratiebestand %s wordt geopend" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Regel %d is te lang (maxl %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfout %s:%u: Extra rommel na waarde" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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" @@@ -2253,7 -2238,6 +2253,7 @@@ msgid "Unable to stat the mount point % msgstr "Kan de status van het aanhechtpunt %s niet opvragen" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Kan %s niet veranderen" @@@ -2504,7 -2488,7 +2504,7 @@@ msgstr " "slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie te " "activeren." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexbestandtype '%s' wordt niet ondersteund" @@@ -2627,7 -2611,7 +2627,7 @@@ msgstr "Fout tijdens verwerken van %s ( #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Fout tijdens verwerken van %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2657,7 -2641,7 +2657,7 @@@ msgstr "Fout tijdens verwerken van %s ( #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Fout tijdens verwerken van %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2707,22 -2691,22 +2707,22 @@@ msgstr "Voorziene bestanden worden verz msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2731,7 -2715,7 +2731,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2740,7 -2724,7 +2740,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2748,7 -2732,7 +2748,7 @@@ msgstr " "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@@ -2861,52 -2845,52 +2861,52 @@@ msgstr " "%i records weggeschreven met %i missende bestanden en %i niet overeenkomende " "bestanden\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s wordt uitgepakt" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Configuratie van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "%s wordt geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s is geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s wordt verwijderd" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s is verwijderd" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Volledige verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s is volledig verwijderd" diff --combined po/nn.po index d161f0a26,0da77a50e..9c3aa53cb --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@@ -161,7 -161,7 +161,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -658,7 -658,7 +658,7 @@@ msgstr "Klarte ikkje endra namnet på % msgid "Y" msgstr "J" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@@ -822,11 -822,11 +822,11 @@@ msgstr "Nokre pakkar må fjernast, men f msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Klarte ikkje låsa nedlastingskatalogen" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." @@@ -855,7 -855,7 +855,7 @@@ msgstr "Etter utpakking vil %sB meir di msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" @@@ -885,7 -885,7 +885,7 @@@ msgstr " "For å halda fram, må du skriva nøyaktig «%s».\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Avbryt." @@@ -893,7 -893,7 +893,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@@ -902,7 -902,7 +902,7 @@@ msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" @@@ -1038,7 -1038,7 +1038,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:" @@@ -1051,32 -1051,32 +1051,32 @@@ msgstr "Intern feil. AllUpgrade øydelag msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade øydelagde noko" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Fann ikkje pakken %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex «%s»\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "men %s skal installerast" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1084,7 -1084,7 +1084,7 @@@ msgstr " "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja " "ei løysing)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1096,7 -1096,7 +1096,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1106,138 -1106,123 +1106,138 @@@ msgstr " "pakken rett og slett ikkje lèt seg installera. I såfall bør du senda\n" "feilmelding." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Øydelagde pakkar" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Dei følgjande tilleggspakkane vil verta installerte:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Føreslåtte pakkar:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Tilrådde pakkar" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislukkast" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Ferdig" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade øydelagde noko" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Må henta %sB med kjeldekodearkiv.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislukkast.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen «%s» mislukkast.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Barneprosessen mislukkast" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, 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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1246,31 -1231,31 +1246,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Støtta modular:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1577,9 -1562,9 +1577,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" @@@ -1882,7 -1867,7 +1882,7 @@@ msgstr "Tidsavbrot på tilkopling til da msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@@ -1909,39 -1894,39 +1909,39 @@@ msgstr "Spørjing msgid "Unable to invoke " msgstr "Klarte ikkje starta " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Koplar til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Koplar til %s" @@@ -2014,76 -1999,76 +2014,76 @@@ msgstr "Klarte ikkje opna røyr for %s msgid "Read error from %s process" msgstr "Lesefeil frå %s-prosessen" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Ventar på hovud" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fekk ei enkel hovudlinje over %u teikn" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Øydelagd hovudlinje" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tenaren sende eit ugyldig svarhovud" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tenaren har øydelagd støtte for område" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsavbrot på sambandet" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Feil ved lesing frå tenaren" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Øydelagde hovuddata" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Intern feil" @@@ -2101,57 -2086,57 +2101,57 @@@ msgstr "Klarte ikkje laga mmap av %lu b msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjend typeforkorting: «%c»" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Opnar oppsettsfila %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Linja %d er for lang (maks %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Misforma tagg" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herifrå" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila" @@@ -2218,7 -2203,6 +2218,7 @@@ msgid "Unable to stat the mount point % msgstr "Klarte ikkje få status til monteringspunktet %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Klarte ikkje byta til %s" @@@ -2466,7 -2450,7 +2466,7 @@@ msgstr " "om du verkeleg vil gjera det, kan du bruka innstillinga «APT::Force-" "LoopBreak»." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indeksfiltypen «%s» er ikkje støtta" @@@ -2586,7 -2570,7 +2586,7 @@@ msgstr "Feil ved behandling av %s (UseP #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Feil ved behandling av %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2616,7 -2600,7 +2616,7 @@@ msgstr "Feil ved behandling av %s (NewV #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Feil ved behandling av %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2664,21 -2648,21 +2664,21 @@@ msgstr "Samlar inn filtilbod msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2687,7 -2671,7 +2687,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2695,14 -2679,14 +2695,14 @@@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, 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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Feil storleik" @@@ -2813,52 -2797,52 +2813,52 @@@ 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, fuzzy, c-format msgid "Preparing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, fuzzy, c-format msgid "Configuring %s" msgstr "Koplar til %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, fuzzy, c-format msgid "Installed %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, fuzzy, c-format msgid "Removing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, fuzzy, c-format msgid "Removed %s" msgstr "Tilrådingar" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" diff --combined po/pl.po index 23d392ed9,92c805033..04842ab64 --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-01-23 15:32+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@@ -157,7 -157,7 +157,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -654,7 -654,7 +654,7 @@@ msgstr "Nie uda³o siê zmieniæ nazwy %s msgid "Y" msgstr "T" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "B³±d kompilacji wyra¿enia regularnego - %s" @@@ -815,11 -815,11 +815,11 @@@ msgstr "Pakiety powinny zostaæ usuniête msgid "Internal error, Ordering didn't finish" msgstr "B³±d wewnêtrzny, sortowanie niezakoñczone" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Nie uda³o siê zablokowaæ katalogu pobierania" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Nie uda³o siê odczytaæ list ¼róde³." @@@ -848,7 -848,7 +848,7 @@@ msgstr "Po rozpakowaniu zostanie dodatk msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie uda³o siê ustaliæ ilo¶ci wolnego miejsca w %s" @@@ -877,7 -877,7 +877,7 @@@ msgstr " "Aby kontynuowaæ wpisz zdanie '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Przerwane." @@@ -885,7 -885,7 +885,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowaæ [T/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie uda³o siê pobraæ %s %s\n" @@@ -894,7 -894,7 +894,7 @@@ msgid "Some files failed to download" msgstr "Nie uda³o siê pobraæ niektórych plików" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Ukoñczono pobieranie w trybie samego pobierania" @@@ -1030,7 -1030,7 +1030,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:" @@@ -1043,31 -1043,31 +1043,31 @@@ msgstr "B³±d wewnêtrzny, rozwi±zywanie msgid "Internal error, AllUpgrade broke stuff" msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Nie uda³o siê odnale¼æ pakietu %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Nie uda³o siê odnale¼æ pakietu %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyra¿enie '%s'\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "ale %s ma zostaæ zainstalowany" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1075,7 -1075,7 +1075,7 @@@ msgstr " "Niespe³nione zale¿no¶ci. Spróbuj 'apt-get -f install' bez pakietów (lub " "podaj rozwi±zanie)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1087,7 -1087,7 +1087,7 @@@ msgstr " "w której niektóre pakiety nie zosta³y jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodz±ce\")." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1097,135 -1097,120 +1097,135 @@@ msgstr " "danego pakietu po prostu nie da siê zainstalowaæ i nale¿y zg³osiæ w nim\n" "b³±d." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Pakiety s± b³êdne" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Zostan± zainstalowane nastêpuj±ce dodatkowe pakiety:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Polecane pakiety:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Nie uda³o siê" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Gotowe" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "B³±d wewnêtrzny, rozwi±zywanie problemów wszystko popsu³o" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, 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:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie ju¿ pobranego pliku '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów ¼róde³.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz ¼ród³o %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Nie uda³o siê pobraæ niektórych archiwów." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiod³o.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sprawd¼ czy pakiet 'dpkg-dev' jest zainstalowany.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiod³o.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Proces potomny zawiód³" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zale¿no¶ci czasu budowania.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1234,7 -1219,7 +1234,7 @@@ msgstr " "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ nie znaleziono " "pakietu %s" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1243,32 -1228,32 +1243,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Nie uda³o siê przetworzyæ zale¿no¶ci na czas budowania" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Obs³ugiwane modu³y:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1579,9 -1564,9 +1579,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Nie mo¿na czytaæ %s" @@@ -1881,7 -1866,7 +1881,7 @@@ msgstr "Przekroczony czas po³±czenia gn msgid "Unable to accept connection" msgstr "Nie uda³o siê przyj±æ po³±czenia" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie uda³o siê obliczyæ skrótu pliku" @@@ -1908,39 -1893,39 +1908,39 @@@ msgstr "Info msgid "Unable to invoke " msgstr "Nie mo¿na wywo³aæ " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Pod³±czanie do %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nie uda³o siê utworzyæ gniazda dla %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nie uda³o siê zainicjalizowaæ po³±czenia z %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "£±czenie z %s" @@@ -2016,76 -2001,76 +2016,76 @@@ msgstr "Nie uda³o siê otworzyæ potoku d msgid "Read error from %s process" msgstr "B³±d odczytu z procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Oczekiwanie na nag³ówki" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Otrzymano pojedyncz± liniê nag³ówka o d³ugo¶ci ponad %u znaków" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Nieprawid³owa linia nag³ówka" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek odpowiedzi" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ten serwer HTTP nieprawid³owo obs³uguje zakresy (ranges)" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Operacja select nie powiod³a siê" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Przekroczenie czasu po³±czenia" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "B³±d przy pisaniu do pliku wyj¶ciowego" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "B³±d przy pisaniu do pliku" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "B³±d przy pisaniu do pliku" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "B³±d czytania z serwera: Zdalna strona zamknê³a po³±czenie" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "B³±d czytania z serwera" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "B³êdne dane nag³ówka" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Po³±czenie nie uda³o siê" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "B³±d wewnêtrzny" @@@ -2103,58 -2088,58 +2103,58 @@@ msgstr "Nie uda³o siê wykonaæ mmap %lu msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nierozpoznany skrót typu: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Otwieranie pliku konfiguracyjnego %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Linia %d jest zbyt d³uga (max %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "B³±d sk³adniowy %s:%u: B³êdny znacznik" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, 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:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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" @@@ -2221,7 -2206,6 +2221,7 @@@ msgid "Unable to stat the mount point % msgstr "Nie uda³o siê wykonaæ operacji stat na punkcie montowania %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Nie uda³o siê przej¶æ do %s" @@@ -2469,7 -2453,7 +2469,7 @@@ msgstr " "nic dobrego, ale je¶li naprawdê chcesz to zrobiæ, w³±cz opcjê APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Plik indeksu typu '%s' nie jest obs³ugiwany" @@@ -2584,8 -2568,8 +2584,8 @@@ msgid "Error occurred while processing msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:153 --#, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++#, fuzzy, c-format ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileDesc1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2614,8 -2598,8 +2614,8 @@@ msgid "Error occurred while processing msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:245 --#, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++#, fuzzy, c-format ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileDesc2)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2665,22 -2649,22 +2665,22 @@@ msgstr "Zbieranie zapewnieñ plików msgid "IO Error saving source cache" msgstr "B³±d wej¶cia/wyj¶cia przy zapisywaniu podrêcznego magazynu ¼róde³" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "nie uda³o siê zmieniæ nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "B³êdna suma MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 #, fuzzy msgid "There is no public key available for the following key IDs:\n" msgstr "Dla nastêpuj±cego identyfikatora klucza brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2689,7 -2673,7 +2689,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2698,14 -2682,14 +2698,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, 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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "B³êdny rozmiar" @@@ -2818,52 -2802,52 +2818,52 @@@ msgstr "Zapisano %i rekordów z %i niepa 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Przygotowanie %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Rozpakowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Przygotowanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Konfigurowanie %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr " Zainstalowany %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Przygotowanie do usuniêcia %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Usuwanie %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Usuniêto %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Przygotowanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Nie uda³o siê usun±æ %s" diff --combined po/pt.po index d936d7ba2,7b8440612..567fdfe60 --- a/po/pt.po +++ b/po/pt.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2007-05-09 22:14+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@@ -159,7 -159,7 +159,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -657,7 -657,7 +657,7 @@@ msgstr "Falha ao renomear %s para %s msgid "Y" msgstr "S" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@@ -818,11 -818,11 +818,11 @@@ msgstr "Pacotes precisam de ser removid msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@@ -853,7 -853,7 +853,7 @@@ msgstr " 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:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossível de determinar espaço livre em %s" @@@ -882,7 -882,7 +882,7 @@@ msgstr " "Para continuar escreva a frase '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Abortado." @@@ -890,7 -890,7 +890,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" @@@ -899,7 -899,7 +899,7 @@@ msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" @@@ -1035,7 -1035,7 +1035,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" @@@ -1048,31 -1048,31 +1048,31 @@@ msgstr "Erro Interno, o solucionador d msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Impossível encontrar o pacote %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "mas %s está para ser instalado" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1080,7 -1080,7 +1080,7 @@@ msgstr " "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1092,7 -1092,7 +1092,7 @@@ msgstr " "distribuição instável, que alguns pacotes requisitados ainda não foram \n" "criados ou foram tirados do Incoming." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1103,134 -1103,119 +1103,134 @@@ msgstr " "de\n" "bug sobre esse pacote." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Pacotes estragados" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Pacotes recomendados :" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Calculando Actualização... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Falhou" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Pronto" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, 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:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, 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:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Falha ao obter alguns arquivos." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "O processo filho falhou" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1239,7 -1224,7 +1239,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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1248,32 -1233,32 +1248,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 requisitos de versão" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de compilação" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Módulos Suportados:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1585,9 -1570,9 +1585,9 @@@ msgstr "Sobreescrita de pacote não coi msgid "File %s/%s overwrites the one in the package %s" msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@@ -1886,7 -1871,7 +1886,7 @@@ msgstr "Ligação de socket de dados ex msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do ficheiro" @@@ -1913,39 -1898,39 +1913,39 @@@ msgstr "Pesquisa msgid "Unable to invoke " msgstr "Impossível invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Ligando a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Não posso iniciar a ligação para %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ligando a %s" @@@ -2024,76 -2009,76 +2024,76 @@@ msgstr "Não foi possível abrir pipe p msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linha de cabeçalho errada" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor http enviou um cabeçalho de resposta inválido" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor http enviou um cabeçalho Conten-Length inválido" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor http enviou um cabeçalho Conten-Range inválido" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor http possui suporte a range errado" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select falhou." -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "A ligação expirou" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligação" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Erro interno" @@@ -2111,58 -2096,58 +2111,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:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo desconhecida: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo ficheiro de configuração %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Linha %d é demasiado longa (max %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag Malformada" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, 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:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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" @@@ -2230,7 -2215,6 +2230,7 @@@ msgid "Unable to stat the mount point % msgstr "Impossível executar stat ao ponto de montagem %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@@ -2478,7 -2462,7 +2478,7 @@@ msgstr " "normalmente é mau, mas se você quer realmente fazer isso, active a opção " "APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipo do ficheiro de índice '%s' não é suportado" @@@ -2599,7 -2583,7 +2599,7 @@@ msgstr "Um erro ocorreu ao processar % #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2629,7 -2613,7 +2629,7 @@@ msgstr "Um erro ocorreu ao processar % #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2683,23 -2667,23 +2683,23 @@@ msgstr "Obtendo File Provides msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2709,7 -2693,7 +2709,7 @@@ msgstr " "que você precisa consertar manualmente este pacote. (devido a arquitectura " "não especificada)." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2718,7 -2702,7 +2718,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2726,7 -2710,7 +2726,7 @@@ msgstr " "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@@ -2838,52 -2822,52 +2838,52 @@@ msgstr " "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "A desempacotar %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "A preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "A preparar para remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "A remover %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "A preparar para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Remoção completa de %s" diff --combined po/pt_BR.po index e48c9d30f,5917df80b..d631ce495 --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-08-21 00:40-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: l10n portuguese \n" @@@ -158,7 -158,7 +158,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -658,7 -658,7 +658,7 @@@ msgstr "Falha ao renomear %s para %s msgid "Y" msgstr "S" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@@ -820,11 -820,11 +820,11 @@@ msgstr "Pacotes precisam ser removidos msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, Ordenação não finalizou" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no diretório de download" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@@ -854,7 -854,7 +854,7 @@@ msgstr " 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:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" @@@ -883,7 -883,7 +883,7 @@@ msgstr " "Para continuar digite a frase '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Abortar." @@@ -891,7 -891,7 +891,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao buscar %s %s\n" @@@ -900,7 -900,7 +900,7 @@@ msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" @@@ -1035,7 -1035,7 +1035,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "A informação a seguir pode ajudar a resolver a situação:" @@@ -1048,31 -1048,31 +1048,31 @@@ msgstr "Erro interno, o solucionador d msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade quebrou as coisas" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Impossível achar pacote %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "mas %s está para ser instalado" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir isso:" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1080,7 -1080,7 +1080,7 @@@ msgstr " "Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1092,7 -1092,7 +1092,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1102,132 -1102,117 +1102,132 @@@ msgstr " "esteja simplesmente não instalável e um relato de erro sobre esse\n" "pacotes deve ser enviado." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Pacotes quebrados" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Pacotes recomendados:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Calculando atualização... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Falhou" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Pronto" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o solucionador de problemas quebrou coisas" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando arquivo já obtido '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Falha ao buscar alguns arquivos." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempacotamento de fonte já desempacotado em %s\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Processo filho falhou" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1236,7 -1221,7 +1236,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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1245,32 -1230,32 +1245,32 @@@ msgstr " "a dependência de %s por %s não pôde ser satisfeita porque nenhuma versão " "disponível do pacote %s pôde satisfazer os requerimentos de versão" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependência de %s por %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de construção" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Módulos suportados:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1583,9 -1568,9 +1583,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@@ -1885,7 -1870,7 +1885,7 @@@ msgstr "Conexão do socket de dados exp msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@@ -1912,39 -1897,39 +1912,39 @@@ msgstr "Pesquisa msgid "Unable to invoke " msgstr "Impossível invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectando em %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Não posso iniciar a conexão para %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@@ -2023,76 -2008,76 +2023,76 @@@ msgstr "Não foi possível abrir pipe p msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linha de cabeçalho ruim" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP possui suporte a range quebrado" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de saída" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Erro interno" @@@ -2110,58 -2095,58 +2110,58 @@@ msgstr "Impossível fazer mmap de %lu b msgid "Selection %s not found" msgstr "Seleção %s não encontrada" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviação de tipo desconhecida: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo arquivo de configuração %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Linha %d muito longa (máx. %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag mal formada" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, 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:701 ++#: apt-pkg/contrib/configuration.cc:702 #, 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:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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" @@@ -2229,7 -2214,6 +2229,7 @@@ msgid "Unable to stat the mount point % msgstr "Impossível checar o ponto de montagem %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@@ -2478,7 -2462,7 +2478,7 @@@ msgstr " "é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipo de arquivo de índice '%s' não é suportado" @@@ -2599,7 -2583,7 +2599,7 @@@ msgstr "Um erro ocorreu processando %s #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2629,7 -2613,7 +2629,7 @@@ msgstr "Um erro ocorreu processando %s #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2683,21 -2667,21 +2683,21 @@@ msgstr "Coletando Arquivo Provides msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar cache fonte" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2707,7 -2691,7 +2707,7 @@@ msgstr " "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2716,7 -2700,7 +2716,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2724,7 -2708,7 +2724,7 @@@ msgstr " "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Tamanho incorreto" @@@ -2839,52 -2823,52 +2839,52 @@@ msgstr " "Gravados %i registros com %i arquivos faltando e %i arquivos que não " "combinam\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Desempacotando %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Preparando para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Preparando para a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Removendo %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparando para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s completamente removido" diff --combined po/ro.po index 9841b3c06,ba80d5c5f..439dc11c7 --- a/po/ro.po +++ b/po/ro.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-09-19 01:35+0300\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" @@@ -159,7 -159,7 +159,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -664,7 -664,7 +664,7 @@@ msgstr "Eşuare în a redenumi %s în % msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@@ -825,11 -825,11 +825,11 @@@ msgstr "Pachete trebuiesc şterse dar Å msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Nu pot încuia directorul de descărcare" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." @@@ -859,7 -859,7 +859,7 @@@ msgstr "După despachetare va fi folosi 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:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spaÅ£iul disponibil în %s" @@@ -889,7 -889,7 +889,7 @@@ msgstr " "Pentru a continua tastaÅ£i fraza '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "RenunÅ£are." @@@ -897,7 -897,7 +897,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "VreÅ£i să continuaÅ£i [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eşuare în aducerea %s %s\n" @@@ -906,7 -906,7 +906,7 @@@ msgid "Some files failed to download" msgstr "Eşuare în descărcarea unor fişiere" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Descărcare completă şi în modul doar descărcare" @@@ -1040,7 -1040,7 +1040,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informaÅ£ii ar putea să vă ajute la rezolvarea situaÅ£iei:" @@@ -1054,31 -1054,31 +1054,31 @@@ msgstr " msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Nu pot găsi pachetul %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "dar %s este pe cale de a fi instalat" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1086,7 -1086,7 +1086,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:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1099,7 -1099,7 +1099,7 @@@ msgstr " "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1109,133 -1109,118 +1109,133 @@@ 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:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Pachete deteriorate" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Pachete sugerate:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Pachete recomandate:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Eşuare" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Terminat" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, 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:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fişierul deja descărcat '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie să descărcaÅ£i %sB din arhivele surselor.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Eşuare în a aduce unele arhive." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eşuată.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "VerificaÅ£i dacă pachetul 'dpkg-dev' este instalat.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eşuată.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Eşuare proces copil" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenÅ£e înglobate.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1244,7 -1229,7 +1244,7 @@@ msgstr " "DependenÅ£a lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1253,32 -1238,32 +1253,32 @@@ 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" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, 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:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Eşuare în a prelucra dependenÅ£ele înglobate" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Module suportate:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1591,9 -1576,9 +1591,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Nu pot citi %s" @@@ -1894,7 -1879,7 +1894,7 @@@ msgstr "Timp de conectare data socket e msgid "Unable to accept connection" msgstr "Nu pot accepta conexiune" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la indexarea fişierului" @@@ -1921,39 -1906,39 +1921,39 @@@ msgstr "Interogare msgid "Unable to invoke " msgstr "Nu pot invoca" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectare la %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nu pot crea un socket pentru %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nu pot iniÅ£ia conectarea la %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectare la %s" @@@ -2030,77 -2015,77 +2030,77 @@@ msgstr "Nu pot deschide conexiunea pent msgid "Read error from %s process" msgstr "Eroare de citire din procesul %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "În aşteptarea antetelor" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Primit o singură linie de antet peste %u caractere" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linie de antet necorespunzătoare" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Serverul http a trimis un antet de răspuns necorespunzător" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serverul http a trimis un antet lungime-conÅ£inut necorespunzător" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serverul http a trimis un antet zonă de conÅ£inut necorespunzător" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Acest server http are zonă de suport necorespunzătoare" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de date necunoscut" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Eşuarea selecÅ£iei" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Eroare la scrierea fişierului de rezultat" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Eroare la scrierea în fişier" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Eroare la scrierea în fişierul" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Conectare eşuată" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Eroare internă" @@@ -2118,58 -2103,58 +2118,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:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tip de prescurtare nerecunoscut: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Deschidere fişier de configurare %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Linie %d prea lungă (max %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Eroare de sintaxă %s:%u: etichetă greşită" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Eroare de sintaxă %s:%u: incluse de aici" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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" @@@ -2237,7 -2222,6 +2237,7 @@@ msgid "Unable to stat the mount point % msgstr "Nu pot determina starea punctului de montare %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Nu pot schimba la %s" @@@ -2485,7 -2469,7 +2485,7 @@@ msgstr " "nu-i de bine, dar dacă vreÅ£i întradevăr s-o faceÅ£i, activaÅ£i opÅ£iunea APT::" "Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipul de fişier index '%s' nu este suportat" @@@ -2605,7 -2589,7 +2605,7 @@@ msgstr "Eroare apărută în timpul pro #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2635,7 -2619,7 +2635,7 @@@ msgstr "Eroare apărută în timpul pro #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2689,23 -2673,23 +2689,23 @@@ msgstr "Colectare furnizori fişier msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eşuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2714,7 -2698,7 +2714,7 @@@ 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ă)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2723,7 -2707,7 +2723,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2731,7 -2715,7 +2731,7 @@@ msgstr " "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@@ -2843,52 -2827,52 +2843,52 @@@ msgid "Wrote %i records with %i missin msgstr "" "S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Se pregăteşte %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Se despachetează %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Se pregăteşte configurarea %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Se configurează %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Instalat %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Se pregăteşte ştergerea lui %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Se şterge %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Şters %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Se pregăteşte ştergerea completă a %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Şters complet %s" diff --combined po/ru.po index 6ab5d829d,7c2d00d1f..76faa0e46 --- a/po/ru.po +++ b/po/ru.po @@@ -12,7 -12,7 +12,7 @@@ msgid " msgstr "" "Project-Id-Version: 0.6.46.4\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2007-01-03 23:33+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@@ -167,7 -167,7 +167,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -672,7 -672,7 +672,7 @@@ msgstr "Не удалось переиРmsgid "Y" msgstr "д" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" @@@ -838,11 -838,11 +838,11 @@@ msgstr "Пакеты необходим msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог для загрузки" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." @@@ -873,7 -873,7 +873,7 @@@ msgid "After unpacking %sB disk space w msgstr "" "После распаковки объем занятого дискового пространства уменьшится на %sB.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" @@@ -904,7 -904,7 +904,7 @@@ msgstr " "Чтобы продолжить, введите фразу: '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Аварийное завершение." @@@ -912,7 -912,7 +912,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось загрузить %s %s\n" @@@ -921,7 -921,7 +921,7 @@@ msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" @@@ -1056,7 -1056,7 +1056,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" @@@ -1069,33 -1069,33 +1069,33 @@@ msgstr "Внутренняя ошибк msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade все поломал" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Не удалось найти пакет %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "но %s будет установлен" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1103,7 -1103,7 +1103,7 @@@ msgstr " "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1114,7 -1114,7 +1114,7 @@@ msgstr " "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1124,136 -1124,121 +1124,136 @@@ msgstr " "пакет просто не может быть установлен из-за ошибок в самом пакете.\n" "Необходимо послать отчёт об этой ошибке." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Сломанные пакеты" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Расчёт обновлений... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Неудачно" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Готово" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходными текстами для %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже загруженный файл '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1262,7 -1247,7 +1262,7 @@@ msgstr " "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1271,32 -1256,32 +1271,32 @@@ msgstr " "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Поддерживаемые модули:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1606,9 -1591,9 +1606,9 @@@ msgstr "Файлы Ð·Ð°Ð¼ÐµÐ½ÑÑŽÑ‚ÑÑ msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s переписывает файл в пакете %s" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" @@@ -1911,7 -1896,7 +1911,7 @@@ msgstr "Время установлен msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" @@@ -1938,39 -1923,39 +1938,39 @@@ msgstr "Запрос msgid "Unable to invoke " msgstr "Невозможно вызвать " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Соединение с %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Не удаётся создать сокет для %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Невозможно инициализировать соединение с %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Соединение с %s" @@@ -2048,76 -2033,76 +2048,76 @@@ msgstr "Не удалось Ð¾Ñ‚ÐºÑ€Ñ‹Ñ msgid "Read error from %s process" msgstr "Ошибка чтения из процесса %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Ожидание заголовков" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен заголовок длиннее %u символов" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Неверный заголовок" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http-сервер послал неверный заголовок" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http сервер послал неверный заголовок Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-сервер послал неверный заголовок Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Внутренняя ошибка" @@@ -2135,59 -2120,59 +2135,59 @@@ msgstr "Невозможно отобр msgid "Selection %s not found" msgstr "Не найдено: %s" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестная аббревиатура типа: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Открытие файла конфигурации %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Строка %d слишком длинна (максимум %d)." --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени." --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтаксическая ошибка %s:%u: искажённый тег" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем " "уровне" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла" @@@ -2254,7 -2239,6 +2254,7 @@@ msgid "Unable to stat the mount point % msgstr "Невозможно прочитать атрибуты точки монтирования %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Невозможно сменить текущий каталог на %s" @@@ -2509,7 -2493,7 +2509,7 @@@ msgstr " "существенно важный пакет %s. Это может привести к фатальным последствиям. " "Если вы действительно хотите продолжить, включите опцию APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Не поддерживается индексный файл типа '%s'" @@@ -2625,7 -2609,7 +2625,7 @@@ msgstr "Произошла ошибкР#: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2655,7 -2639,7 +2655,7 @@@ msgstr "Произошла ошибкР#: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2703,21 -2687,21 +2703,21 @@@ msgstr "Сбор информации Ð msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кеш исходных текстов" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен общий ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2726,7 -2710,7 +2726,7 @@@ msgstr " "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2735,13 -2719,13 +2735,13 @@@ msgstr " "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Не совпадает размер" @@@ -2856,52 -2840,52 +2856,52 @@@ msgstr " "Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими " "файлами\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Подготавливается %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Распаковывается %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Подготавливается для конфигурации %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Настройка %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Установлен %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Подготавливается для удаления %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Удаление %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Удалён %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка к полному удалению %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s полностью удалён" diff --combined po/sk.po index 33255af91,01aafcbc3..cf67780c4 --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-09-10 18:50+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@@ -158,7 -158,7 +158,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -653,7 -653,7 +653,7 @@@ msgstr "Premenovanie %s na %s zlyhalo msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@@ -814,11 -814,11 +814,11 @@@ msgstr "Je potrebné odstránenie balí msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba, Triedenie sa neukončilo" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Adresár pre sÅ¥ahovanie sa nedá zamknúť" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Nedá sa načítaÅ¥ zoznam zdrojov." @@@ -849,7 -849,7 +849,7 @@@ msgstr "Po rozbalení sa na disku použ msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení sa na disku uvoľní %sB.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiÅ¥ veľkosÅ¥ voľného miesta" @@@ -878,7 -878,7 +878,7 @@@ msgstr " "Pre pokračovanie opíšte frázu '%s'\n" " ?]" - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "PreruÅ¡ené." @@@ -886,7 -886,7 +886,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovaÅ¥ [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" @@@ -895,7 -895,7 +895,7 @@@ msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuÅ¥" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "SÅ¥ahovanie ukončené v režime \"iba stiahnuÅ¥\"" @@@ -1028,7 -1028,7 +1028,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 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:" @@@ -1041,31 -1041,31 +1041,31 @@@ msgstr "Vnútorná chyba, problem resol msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Balík %s sa nedá nájsÅ¥" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsÅ¥" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, 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:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "ale inÅ¡talovaÅ¥ sa bude %s" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1073,7 -1073,7 +1073,7 @@@ msgstr " "Nesplnené závislosti. Skúste spustiÅ¥ 'apt-get -f install' bez balíkov (alebo " "navrhnite rieÅ¡enie)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1085,7 -1085,7 +1085,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1095,139 -1095,124 +1095,139 @@@ 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:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "PoÅ¡kodené balíky" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "NainÅ¡talujú sa nasledovné extra balíky:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Navrhované balíky:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Odporúčané balíky:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Chyba" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Hotovo" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Vnútorná chyba, problem resolver pokazil veci" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, 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:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, 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:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "StiahnuÅ¥ zdroj %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Skontrolujte, či je nainÅ¡talovaný balík 'dpkg-dev'.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Proces potomka zlyhal" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, 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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1236,31 -1221,31 +1236,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniÅ¥." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Podporované moduly:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1567,9 -1552,9 +1567,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "%s sa nedá čítaÅ¥" @@@ -1868,7 -1853,7 +1868,7 @@@ msgstr "Uplynulo spojenie dátového so msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijaÅ¥" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashovaním súboru" @@@ -1895,39 -1880,39 +1895,39 @@@ msgstr "Dotaz msgid "Unable to invoke " msgstr "Nedá sa vyvolaÅ¥ " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Pripája sa k %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nedá sa vytvoriÅ¥ socket pre %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nedá sa nadviazaÅ¥ spojenie na %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Pripája sa k %s" @@@ -2003,76 -1988,76 +2003,76 @@@ msgstr "Nedá sa otvoriÅ¥ rúra pre %s msgid "Read error from %s process" msgstr "Chyba pri čítaní z procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čaká sa na hlavičky" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal sa jeden riadok hlavičky cez %u znakov" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP server poslal neplatnú hlavičku odpovede" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP server poslal neplatnú hlavičku Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP server poslal neplatnú hlavičku Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má poÅ¡kodenú podporu rozsahov" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Vnútorná chyba" @@@ -2090,58 -2075,58 +2090,58 @@@ msgstr "Nedá sa urobiÅ¥ mmap %lu bajto msgid "Selection %s not found" msgstr "Voľba %s nenájdená" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nerozpoznaná skratka typu: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Otvára sa konfiguračný súbor %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Riadok %d je príliÅ¡ dlhý (nanajvýš %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Skomolená značka" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, 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" @@@ -2208,7 -2193,6 +2208,7 @@@ msgid "Unable to stat the mount point % msgstr "Prípojný bod %s sa nedá vyhodnotiÅ¥" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Nedá sa prejsÅ¥ do %s" @@@ -2455,7 -2439,7 +2455,7 @@@ msgstr " "kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete " "naozaj urobiÅ¥, aktivujte možnosÅ¥ APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexový typ súboru '%s' nie je podporovaný" @@@ -2570,7 -2554,7 +2570,7 @@@ msgstr "Chyba pri spracovávaní %s (Us #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Chyba pri spracovávaní %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2600,7 -2584,7 +2600,7 @@@ msgstr "Chyba pri spracovávaní %s (Ne #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Chyba pri spracovávaní %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2650,21 -2634,21 +2650,21 @@@ msgstr "Collecting File poskytuje msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súčtov" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2673,7 -2657,7 +2673,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2682,13 -2666,13 +2682,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, 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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@@ -2800,52 -2784,52 +2800,52 @@@ 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Pripravuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Pripravuje sa nastavenie %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Nastavuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "NainÅ¡talovaný balík %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravuje sa odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Odstraňuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Odstránený balík %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravuje sa úplné odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Balík '%s' je úplne odstránený" diff --combined po/sl.po index 7461a1c92,9c0f151b6..637db98c8 --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev \n" "Language-Team: Slovenian \n" @@@ -155,7 -155,7 +155,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -653,7 -653,7 +653,7 @@@ msgstr "Ni mogoèe preimenovati %s v %s msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" @@@ -816,11 -816,11 +816,11 @@@ msgstr "Odstraniti je potrebno pakete, msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Ni mogoèe zakleniti imenika za prenose" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoèe brati." @@@ -849,7 -849,7 +849,7 @@@ msgstr "Po odpakiranju bo uporabljeneg 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:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" @@@ -878,7 -878,7 +878,7 @@@ msgstr " "Za nadaljevanje vnesite frazo '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Prekini." @@@ -886,7 -886,7 +886,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Ali ¾elite nadaljevati [Y/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoèe dobiti %s %s\n" @@@ -895,7 -895,7 +895,7 @@@ msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Prenos dokonèan in uporabljen naèin samo prenos" @@@ -1029,7 -1029,7 +1029,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:" @@@ -1042,31 -1042,31 +1042,31 @@@ msgstr "Notranja napaka zaradi AllUpgra msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Ni mogoèe najti paketa %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoèe najti paketa %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "vendar bo paket %s name¹èen" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1074,7 -1074,7 +1074,7 @@@ msgstr " "Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte re¹itev)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1085,7 -1085,7 +1085,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1095,141 -1095,126 +1095,141 @@@ msgstr " "preprosto ne da namestiti in je potrebno vlo¾iti poroèilo o hro¹èu\n" "o tem paketu." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Pokvarjeni paketi" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo name¹èeni:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Predlagani paketi:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Priporoèeni paketi:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Preraèunavanje nadgradnje ... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Spodletelo" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Opravljeno" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoèe najti" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoèe dobiti." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Otro¹ki proces ni uspel" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, 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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1238,31 -1223,31 +1238,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, 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:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Podprti moduli:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1571,9 -1556,9 +1571,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Ni mogoèe brati %s" @@@ -1872,7 -1857,7 +1872,7 @@@ msgstr "Povezava podatkovne vtiènice po msgid "Unable to accept connection" msgstr "Ni mogoèe sprejeti povezave" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Te¾ava pri razpr¹evanju datoteke" @@@ -1899,39 -1884,39 +1899,39 @@@ msgstr "Poizvedba msgid "Unable to invoke " msgstr "Ni mogoèe zagnati " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Povezovanje z %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Ni mogoèe ustvariti vtiènice za %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni mogoèe zaèeti povezave z %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se z %s" @@@ -2004,76 -1989,76 +2004,76 @@@ msgstr "Ni mogoèe odprti %s msgid "Read error from %s process" msgstr "Napaka pri branju iz procesa %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Èakanje na glave" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Dobljena je ena vrstica glave preko %u znakov" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Napaèna vrstica glave" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Stre¾nik HTTP je poslal napaèno glavo odgovora" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Stre¾nik HTTP je poslal glavo z napaèno dol¾ino vsebine" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Stre¾nik HTTP je poslal glavo z napaènim obsegom vsebine" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ta stre¾nik HTTP ima pokvarjen obseg podpore" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Èas za povezavo se je iztekel" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s stre¾nika " -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Napaka pri branju s stre¾nika" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Napaèni podatki glave" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Notranja napaka" @@@ -2091,58 -2076,58 +2091,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:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ne-prepoznan tip okraj¹ave: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Odpiranje nastavitvene datoteke %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Vrstica %d je predolga (najveè %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Skladenjska napaka %s:%u: Nepravilna znaèka." --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Skladenjska napaka %s:%u: Vkljuèen od tu." --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke" @@@ -2209,7 -2194,6 +2209,7 @@@ msgid "Unable to stat the mount point % msgstr "Ni mogoèe doloèiti priklopne toèke %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Ni mogoèe spremeniti v %s" @@@ -2456,7 -2440,7 +2456,7 @@@ msgstr " "zanke spora/predodvisnosti. To je ponavadi slabo, toda èe zares ¾elite " "odstranitev, vkljuèite mo¾nost APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Vrsta datoteke s kazalom '%s' ni podprta" @@@ -2575,7 -2559,7 +2575,7 @@@ msgstr "Pri¹lo je do napake pri obdelav #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2605,7 -2589,7 +2605,7 @@@ msgstr "Pri¹lo je do napake pri obdelav #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2653,21 -2637,21 +2653,21 @@@ msgstr "Zbiranje dobaviteljev datotek msgid "IO Error saving source cache" msgstr "Napaka IO pri shranjevanju predpomnilnika virov" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2676,7 -2660,7 +2676,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2685,7 -2669,7 +2685,7 @@@ msgstr " "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2693,7 -2677,7 +2693,7 @@@ msgstr " "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@@ -2806,52 -2790,52 +2806,52 @@@ msgstr " "Zapisal %i zapisov z %i manjkajoèimi datotekami in %i neujemajoèimi " "datotekami.\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, fuzzy, c-format msgid "Preparing %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se z %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, fuzzy, c-format msgid "Installed %s" msgstr " Name¹èen: " -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, fuzzy, c-format msgid "Removing %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, fuzzy, c-format msgid "Removed %s" msgstr "Priporoèa" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Odstranitev %s ni uspela" diff --combined po/sv.po index 753510edb,498aa4043..3f7e149e3 --- a/po/sv.po +++ b/po/sv.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-08-18 15:45+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@@ -159,7 -159,7 +159,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -660,7 -660,7 +660,7 @@@ msgstr "Misslyckades med att byta namn msgid "Y" msgstr "J" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid tolkning av reguljärt uttryck - %s" @@@ -822,11 -822,11 +822,11 @@@ msgstr "Paket måste tas bort men \"Remo msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen." - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." @@@ -857,7 -857,7 +857,7 @@@ msgstr "Efter uppackning kommer %sB ytt msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigöras på disken.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte läsa av ledigt utrymme i %s" @@@ -887,7 -887,7 +887,7 @@@ msgstr " " ?] " # Visas då man svarar nej - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Avbryter." @@@ -895,7 -895,7 +895,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" @@@ -904,7 -904,7 +904,7 @@@ msgid "Some files failed to download" msgstr "Misslyckades med att hämta vissa filer" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" @@@ -1039,7 -1039,7 +1039,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 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:" @@@ -1052,32 -1052,32 +1052,32 @@@ msgstr "Internt fel, problemlösaren brö msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Kunde inte hitta paketet %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, väljer %s för regex \"%s\"\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "men %s kommer att installeras" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1085,7 -1085,7 +1085,7 @@@ msgstr " "Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket " "(eller ange en lösning)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1097,7 -1097,7 +1097,7 @@@ msgstr " "distributionen, att några krävda paket ännu inte har skapats eller\n" "lagts in från \"Incoming\"." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1107,130 -1107,115 +1107,130 @@@ msgstr " "helt enkelt inte kan installeras och att en felrapport om detta bör\n" "skrivas." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Trasiga paket" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Föreslagna paket:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Rekommenderade paket:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Misslyckades" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Färdig" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren bröt sönder saker" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, 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:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtad fil \"%s\"\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, 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:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkod %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Kontrollera att paketet \"dpkg-dev\" är installerat.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Barnprocessen misslyckades" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta byggberoendeinformation för %s" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1238,7 -1223,7 +1238,7 @@@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1247,32 -1232,32 +1247,32 @@@ msgstr " "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s uppfyller versionskraven" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att uppfylla %s-beroendet för %s: Det installerade paketet %" "s är för nytt" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att uppfylla %s-beroendet för %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte uppfyllas." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Moduler som stöds:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1587,9 -1572,9 +1587,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:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Kunde inte läsa %s" @@@ -1889,7 -1874,7 +1889,7 @@@ msgstr "Anslutet datauttag (socket) fic msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@@ -1918,40 -1903,40 +1918,40 @@@ msgid "Unable to invoke msgstr "Kunde inte starta " # Felmeddelande för misslyckad chdir -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Ansluter till %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" # [f]amilj, [t]yp, [p]rotokoll -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kunde inte skapa uttag (socket) för %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kunde inte påbörja anslutning till %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, 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:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" @@@ -2029,76 -2014,76 +2029,76 @@@ msgstr "Kunde inte öppna rör för %s msgid "Read error from %s process" msgstr "Läsfel på %s-processen" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Väntar på huvuden" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fick en ensam huvudrad på %u tecken" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Trasig huvudrad" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http-servern sände ett ogiltigt svarshuvud" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http-servern sände ett ogiltigt Content-Length-huvud" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-servern sände ett ogiltigt Content-Range-huvud" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denna http-servers stöd för delvis hämtning fungerar inte" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsgränsen för anslutningen nåddes" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Internt fel" @@@ -2116,57 -2101,57 +2116,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:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Okänd typförkortning: \"%c\"" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Öppnar konfigurationsfil %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Rad %d för lång (max %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfel %s:%u: Felformat märke" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfel %s:%u: Inkluderad härifrån" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds ej" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut" @@@ -2234,7 -2219,6 +2234,7 @@@ msgstr "Kunde inte ta status på monteri # Felmeddelande för misslyckad chdir #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Kunde inte gå till %s" @@@ -2485,7 -2469,7 +2485,7 @@@ msgstr " "Detta är oftast en dålig idé, men om du verkligen vill göra det kan du " "aktivera flaggan \"APT::Force-LoopBreak\"." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexfiler av typ \"%s\" stöds inte" @@@ -2604,7 -2588,7 +2604,7 @@@ msgstr "Fel uppstod vid hantering av % #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2634,7 -2618,7 +2634,7 @@@ msgstr "Fel uppstod vid hantering av % #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2683,21 -2667,21 +2683,21 @@@ msgstr "Samlar filberoenden msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stämmer inte" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen publik nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2706,7 -2690,7 +2706,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:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2715,13 -2699,13 +2715,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:1314 +#: apt-pkg/acquire-item.cc:1365 #, 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:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Storleken stämmer inte" @@@ -2832,52 -2816,52 +2832,52 @@@ 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Förbereder %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Packar upp %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Förbereder konfigurering av %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Konfigurerar %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Installerade %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Förbereder för borttagning av %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Tog bort %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Förbereder att ta bort hela %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Tog bort hela %s" diff --combined po/tl.po index f25adab9b,5980e81b6..26a060707 --- a/po/tl.po +++ b/po/tl.po @@@ -10,7 -10,7 +10,7 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@@ -162,7 -162,7 +162,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -665,7 -665,7 +665,7 @@@ msgstr "Bigo ang pagpangalan muli ng % msgid "Y" msgstr "O" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@@ -830,11 -830,11 +830,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." @@@ -866,7 -866,7 +866,7 @@@ msgstr " msgid "After unpacking %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" @@@ -895,7 -895,7 +895,7 @@@ msgstr " "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Abort." @@@ -903,7 -903,7 +903,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@@ -912,7 -912,7 +912,7 @@@ msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" @@@ -1047,7 -1047,7 +1047,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" @@@ -1061,32 -1061,32 +1061,32 @@@ msgstr "Error na internal, may nasira a msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Hindi mahanap ang paketeng %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "ngunit ang %s ay iluluklok" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 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:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1094,7 -1094,7 +1094,7 @@@ msgstr " "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1105,7 -1105,7 +1105,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:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1115,130 -1115,115 +1115,130 @@@ msgstr " "hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Sirang mga pakete" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Bigo" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Tapos" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 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:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, 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:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, 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:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Bigo ang prosesong anak" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 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:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, 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:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@@ -1247,7 -1232,7 +1247,7 @@@ msgstr " "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1256,32 -1241,32 +1256,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:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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 %" "s ay bagong-bago pa lamang." - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Suportadong mga Module:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1591,9 -1576,9 +1591,9 @@@ msgstr "Patungan ng paketeng nag-match msgid "File %s/%s overwrites the one in the package %s" msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" @@@ -1893,7 -1878,7 +1893,7 @@@ msgstr "Nag-timeout ang socket ng datos msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@@ -1920,39 -1905,39 +1920,39 @@@ msgstr "Tanong msgid "Unable to invoke " msgstr "Hindi ma-invoke " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Hindi maka-konekta sa %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kumokonekta sa %s" @@@ -2031,76 -2016,76 +2031,76 @@@ msgstr "Hindi makapag-bukas ng pipe par msgid "Read error from %s process" msgstr "Error sa pagbasa mula sa prosesong %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Naghihintay ng panimula" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Maling linyang panimula" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Nagpadala ang HTTP server ng di tanggap na reply header" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Sira ang range support ng HTTP server na ito" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Internal na error" @@@ -2118,58 -2103,58 +2118,58 @@@ msgstr "Hindi makagawa ng mmap ng %lu n msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Hindi kilalang katagang uri: '%c'" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Binubuksan ang talaksang pagsasaayos %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Labis ang haba ng linyang %d (max %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, 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:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Maling anyo ng Tag" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, 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:681 ++#: apt-pkg/contrib/configuration.cc:682 #, 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:688 ++#: apt-pkg/contrib/configuration.cc:689 #, 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:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Sinama mula dito" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan" @@@ -2238,7 -2223,6 +2238,7 @@@ msgid "Unable to stat the mount point % msgstr "Di mai-stat ang mount point %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Di makalipat sa %s" @@@ -2489,7 -2473,7 +2489,7 @@@ msgstr " "loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-" "activate ang APT::Force-LoopBreak na option." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Hindi suportado ang uri ng talaksang index na '%s'" @@@ -2611,7 -2595,7 +2611,7 @@@ msgstr "May naganap na error habang pri #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:178 @@@ -2641,7 -2625,7 +2641,7 @@@ msgstr "May naganap na error habang pri #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:251 @@@ -2691,21 -2675,21 +2691,21 @@@ msgstr "Kinukuha ang Talaksang Provides msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2714,7 -2698,7 +2714,7 @@@ msgstr " "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2723,7 -2707,7 +2723,7 @@@ msgstr " "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2731,7 -2715,7 +2731,7 @@@ msgstr " "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Di tugmang laki" @@@ -2846,52 -2830,52 +2846,52 @@@ msgstr " "Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang " "mismatch\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Hinahanda ang %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Binubuklat ang %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Hinahanda ang %s upang isaayos" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Isasaayos ang %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Naghahanda para sa pagtanggal ng %s" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Tinatanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Tinanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Naghahanda upang tanggalin ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Natanggal ng lubusan ang %s" diff --combined po/vi.po index 042f5f8a4,7cec3c1e2..052951b98 --- a/po/vi.po +++ b/po/vi.po @@@ -6,15 -6,15 +6,15 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 22:26+0200\n" -"PO-Revision-Date: 2007-06-21 15:56+0930\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" +"PO-Revision-Date: 2007-06-01 15:00+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.6.4a1\n" +"X-Generator: LocFactoryEditor 1.6.3b1\n" #: cmdline/apt-cache.cc:143 #, c-format @@@ -57,9 -57,8 +57,9 @@@ msgid "Total distinct versions: msgstr "Tổng số phiên bản riêng: " #: cmdline/apt-cache.cc:295 +#, fuzzy msgid "Total Distinct Descriptions: " -msgstr "Tổng số mô tả riêng: " +msgstr "Tổng số phiên bản riêng: " #: cmdline/apt-cache.cc:297 msgid "Total dependencies: " @@@ -70,9 -69,8 +70,9 @@@ msgid "Total ver/file relations: msgstr "Tổng số liên quan phiên bản và tập tin: " #: cmdline/apt-cache.cc:302 +#, fuzzy msgid "Total Desc/File relations: " -msgstr "Tổng số liên quan mô tả/tập tin:" +msgstr "Tổng số liên quan phiên bản và tập tin: " #: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " @@@ -162,7 -160,7 +162,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s cho %s %s được biên dịch vào %s %s\n" @@@ -686,7 -684,7 +686,7 @@@ msgstr "Việc đổi tên %s thành % msgid "Y" msgstr "C" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dich biểu thức chính quy - %s" @@@ -849,11 -847,11 +849,11 @@@ msgstr "Cần phải gỡ bỏ một sá msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chÆ°a xong" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "Không thể khóa thÆ° mục tải về" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Không thể đọc danh sách nguồn." @@@ -883,7 -881,7 +883,7 @@@ msgstr "Sau khi đã giải nén, sẻ msgid "After unpacking %sB disk space will be freed.\n" msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể quyết định chỗ rảnh trong %s" @@@ -913,7 -911,7 +913,7 @@@ msgstr " "Để tiếp tục thì hãy gõ cụm từ « %s »\n" "?]" - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "Hủy bỏ." @@@ -921,7 -919,7 +921,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc gói %s bị lỗi %s\n" @@@ -930,7 -928,7 +930,7 @@@ msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" @@@ -1047,63 -1045,64 +1047,63 @@@ msgstr " #: cmdline/apt-get.cc:1433 msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tá»± động" +msgstr "" #: cmdline/apt-get.cc:1465 +#, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" -msgstr "" -"Theo đây có những gói đã được cài đặt tá»± động nên không còn cần thiết lại:" +msgstr "Theo đây có những gói MỚI sẽ được cài đặt:" #: cmdline/apt-get.cc:1467 msgid "Use 'apt-get autoremove' to remove them." -msgstr "Hãy sá»­ dụng lệnh « apt-get autoremove » để gỡ bỏ chúng." +msgstr "" #: cmdline/apt-get.cc:1472 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -"Ừm, có vẻ là Bộ Gỡ bỏ Tá»± động đã hủy cái gì, một trường hợp thá»±c sá»± không " -"nên xảy ra. Hãy thông báo lỗi về apt." --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" #: cmdline/apt-get.cc:1479 +#, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tá»± động đã làm hÆ° gì." +msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" #: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" --#: cmdline/apt-get.cc:1543 -#, c-format ++#: cmdline/apt-get.cc:1544 +#, fuzzy, c-format msgid "Couldn't find task %s" -msgstr "Không tìm thấy tác vụ %s" +msgstr "Không tìm thấy gói %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n" --#: cmdline/apt-get.cc:1711 -#, c-format ++#: cmdline/apt-get.cc:1712 +#, fuzzy, c-format msgid "%s set to manual installed.\n" -msgstr "%s được đặt thành « được cài đặt thủ công ».\n" +msgstr "nhÆ°ng mà %s sẽ được cài đặt" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sá»­a hết:" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1111,7 -1110,7 +1111,7 @@@ msgstr " "Gói còn phụ thuộc vào phần mềm chÆ°a có. Hãy cố chạy lệnh « apt-get -f " "install » mà không có gói nào (hoặc ghi rõ cách quyết định)." --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1123,7 -1122,7 +1123,7 @@@ msgstr " "bất định, có lẽ chÆ°a tạo một số gói cần thiết,\n" "hoặc chÆ°a di chuyển chúng ra phần Incoming (Đến)." --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1133,138 -1132,123 +1133,138 @@@ msgstr " "gói này đơn giản không có khả năng cài đặt, thì bạn hay\n" "thông báo lỗi về gói này." --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "Gói bị ngắt" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "Những gói thêm theo đây sẽ được cài đặt:" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "Gói được đệ nghị:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "Gói được khuyên:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "Đang tính nâng cấp... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Bị lỗi" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "Xong" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ sức chứa còn rảnh trong %s" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB kho nguồn.\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "Lấy nguồn %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "Việc lấy một số kho bị lỗi." - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén « %s » bị lỗi.\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chÆ°a.\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dụng « %s » bị lỗi.\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi xây dụng.\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s" - #: cmdline/apt-get.cc:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1273,32 -1257,31 +1273,32 @@@ msgstr " "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng " "của gói %s có thể thỏa điều kiện phiên bản." - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới" - #: cmdline/apt-get.cc:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s." - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "Việc xá»­ lý cách phụ thuộc khi xây dụng bị lỗi" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "Mô-đun đã hỗ trợ :" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1357,6 -1340,7 +1357,6 @@@ msgstr " " upgrade \t_Nâng cập_ \n" " install \t\t_Cài đặt_ gói mới (gói là libc6 không phải libc6.deb)\n" " remove \t_Gỡ bỏ_ gói\n" -" purge\t\tGỡ bỏ và _tẩy_ gói\n" " source \t\tTải về kho _nguồn_\n" " build-dep \tĐịnh cấu hình _cách phụ thuộc khi xây dụng_, cho gói nguồn\n" " dist-upgrade \t_Nâng cấp bản phân phối_,\n" @@@ -1615,9 -1599,9 +1615,9 @@@ msgstr "Ghi đè lên gói đã khớp msgid "File %s/%s overwrites the one in the package %s" msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Không thể đọc %s" @@@ -1919,7 -1903,7 +1919,7 @@@ msgstr "Kết nối ổ cắm dữ liá» msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Gặp khó khăn băm tập tin" @@@ -1946,39 -1930,39 +1946,39 @@@ msgstr "Truy vấn msgid "Unable to invoke " msgstr "Không thể gọi " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Đang kết nối đến %s (%s)..." -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[Địa chỉ IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Không thể sở khởi kết nối đến %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giờ" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Không thể kết nối đến %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Đang kết nối đến %s..." @@@ -2052,80 -2036,80 +2052,80 @@@ msgstr "Không thể mở ống dẫn c msgid "Read error from %s process" msgstr "Gặp lỗi đọc từ tiến trình %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Đang đợi những phần đầu..." -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Đã lấy một dòng đầu riêng lẻ chứa hÆ¡n %u ky tá»±" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Dòng đầu sai" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không " "hợp lệ" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không " "hợp lệ" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Không biết dạng ngày" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@@ -2143,57 -2127,57 +2143,57 @@@ msgstr "Không thể tạo mmap (ảnh msgid "Selection %s not found" msgstr "Không tìm thấy vùng chọn %s" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Không nhận biết viết tắt kiểu: « %c »" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "Đang mở tập tin cấu hình %s..." --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "Dòng %d quá dài (tối đa %d)" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên." --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Gặp lỗi cú pháp %s:%u: có thể thá»±c hiện chỉ thị chỉ tại mức đầu" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gặp lỗi cú pháp %s:%u: chÆ°a hỗ trợ chỉ thị « %s »" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin" @@@ -2260,7 -2244,6 +2260,7 @@@ msgid "Unable to stat the mount point % msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Không thể chuyển đổi sang %s" @@@ -2387,7 -2370,7 +2387,7 @@@ msgstr "Làm cÅ© #: apt-pkg/pkgcache.cc:226 msgid "Breaks" -msgstr "Làm hÆ°" +msgstr "" #: apt-pkg/pkgcache.cc:237 msgid "important" @@@ -2422,19 -2405,18 +2422,19 @@@ msgid "Dependency generation msgstr "Tạo ra cách phụ thuộc" #: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy msgid "Reading state information" -msgstr "Đang đọc thông tin tình trạng" +msgstr "Đang hợp nhất các thông tin sẵn sàng..." #: apt-pkg/depcache.cc:198 -#, c-format +#, fuzzy, c-format msgid "Failed to open StateFile %s" -msgstr "Lỗi mở tập tin tình trạng StateFile %s" +msgstr "Việc mở %s bị lỗi" #: apt-pkg/depcache.cc:204 -#, c-format +#, fuzzy, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Lỗi ghi tập tin tình trạng StateFile tạm thời %s" +msgstr "Việc ghi tập tin %s bị lỗi" #: apt-pkg/tagfile.cc:102 #, c-format @@@ -2511,7 -2493,7 +2511,7 @@@ msgstr " "bạn thật sá»± muốn tiếp tục, có thể hoạt hóa tuy chọn « APT::Force-LoopBreak " "» (buộc ngắt vòng lặp)." -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »" @@@ -2630,9 -2612,9 +2630,9 @@@ msgid "Error occurred while processing msgstr "Gặp lỗi khi xá»­ lý %s (UsePackage1 - dùng gói 1)" #: apt-pkg/pkgcachegen.cc:153 -#, c-format -msgid "Error occured while processing %s (NewFileDesc1)" -msgstr "Gặp lỗi khi xá»­ lý %s (NewFileDesc1 - tập tin mô tả mới 1)" +#, fuzzy, c-format - msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Gặp lỗi khi xá»­ lý %s (NewFileVer1 - tập tin mới, phiên bản 1)" #: apt-pkg/pkgcachegen.cc:178 #, c-format @@@ -2660,9 -2642,9 +2660,9 @@@ msgid "Error occurred while processing msgstr "Gặp lỗi khi xá»­ lý %s (NewVersion2 - phiên ban mới 2)" #: apt-pkg/pkgcachegen.cc:245 -#, c-format -msgid "Error occured while processing %s (NewFileDesc2)" -msgstr "Gặp lỗi khi xá»­ lý %s (NewFileDesc1 - tập tin mô tả mới 2)" +#, fuzzy, c-format - msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Gặp lỗi khi xá»­ lý %s (NewFileVer1 - tập tin mới, phiên bản 1)" #: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." @@@ -2673,9 -2655,8 +2673,9 @@@ msgid "Wow, you exceeded the number of msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." #: apt-pkg/pkgcachegen.cc:257 +#, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." +msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." #: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." @@@ -2711,21 -2692,21 +2711,21 @@@ msgstr "Đang tập hợp các trườn msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lÆ°u bộ nhớ tạm nguồn" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum (tổng kiểm) không khớp được" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2734,7 -2715,7 +2734,7 @@@ msgstr " "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tá»± sá»­a gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2743,7 -2724,7 +2743,7 @@@ msgstr " "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tá»± sá»­a gói " "này." -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@@ -2751,7 -2732,7 +2751,7 @@@ msgstr " "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Kích cỡ không khớp được" @@@ -2801,11 -2782,12 +2801,11 @@@ msgid "Scanning disc for index files..\ msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" #: apt-pkg/cdrom.cc:671 -#, c-format +#, fuzzy, c-format msgid "" "Found %i package indexes, %i source indexes, %i translation indexes and %i " "signatures\n" -msgstr "" -"Tìm thấy %i chỉ mục gói, %i chỉ mục nguồn, %i chỉ mục dịch và %i chữ ký\n" +msgstr "Mới tìm %i chỉ mục gói, %i chỉ mục nguồn và %i chữ ký\n" #: apt-pkg/cdrom.cc:708 #, c-format @@@ -2863,60 -2845,59 +2863,60 @@@ msgstr " "Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với " "nhau\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Đang chuẩn bị %s..." -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Đang mở gói %s..." -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Đang chuẩn bị cấu hình %s..." -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Đang cấu hình %s..." -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Đã cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Đang chuẩn bị gỡ bỏ %s..." -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Đang gỡ bỏ %s..." -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Đã gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..." -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Mới gỡ bỏ hoàn toàn %s" #: methods/rred.cc:219 +#, fuzzy msgid "Could not patch file" -msgstr "Không thể vá lỗi trong tập tin %s" +msgstr "Không thể mở tập tin %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" diff --combined po/zh_CN.po index 204f78276,fe5108046..51f68874b --- a/po/zh_CN.po +++ b/po/zh_CN.po @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2007-03-29 17:14+0800\n" "Last-Translator: Kov Chai \n" "Language-Team: Debian Chinese [GB] \n" @@@ -158,7 -158,7 +158,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -652,7 -652,7 +652,7 @@@ msgstr "无法将 %s 重命名为 %s msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@@ -813,11 -813,11 +813,11 @@@ msgstr "有软件包需要被卸载，ä msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" @@@ -846,7 -846,7 +846,7 @@@ msgstr "解压缩后会消耗掉 %sB çš msgid "After unpacking %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的空余空间" @@@ -875,7 -875,7 +875,7 @@@ msgstr " "若还想继续的话，就输入下面的短句“%s”\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "中止执行。" @@@ -883,7 -883,7 +883,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@@ -892,7 -892,7 +892,7 @@@ msgid "Some files failed to download" msgstr "有一些文件下载失败" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" @@@ -1025,7 -1025,7 +1025,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "下列的信息可能会对解决问题有所帮助：" @@@ -1038,31 -1038,31 +1038,31 @@@ msgstr "内部错误，problem resolve msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，AllUpgrade 坏事了" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "无法找到软件包 %s" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "但是 %s 正要被安装" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1070,7 -1070,7 +1070,7 @@@ msgstr " "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1081,7 -1081,7 +1081,7 @@@ msgstr " "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1090,137 -1090,122 +1090,137 @@@ msgstr " "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n" "您最好提交一个针对这个软件包的故障报告。" --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "无法安装的软件包" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "建议安装的软件包：" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "推荐安装的软件包：" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "正在筹划升级... " - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "失败" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "完成" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，problem resolver 坏事了" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "子进程出错" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, 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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1229,30 -1214,30 +1229,30 @@@ msgstr " "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "被支持模块：" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1556,9 -1541,9 +1556,9 @@@ msgstr "用来覆盖的软件包不属ä msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" @@@ -1855,7 -1840,7 +1855,7 @@@ msgstr "数据套接字连接超时 msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@@ -1882,39 -1867,39 +1882,39 @@@ msgstr "查询 msgid "Unable to invoke " msgstr "无法调用 " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "正在连接 %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "无法发起与 %s:%s (%s) 的连接" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "无法连接上 %s:%s (%s)，连接超时" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" @@@ -1986,76 -1971,76 +1986,76 @@@ msgstr "无法为 %s 开启管道 msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "受到了一行报头条目，它的长度超过了 %u 个字符" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "错误的报头条目" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "该 http 服务器发送了一个无效的应答报头" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 http 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 http 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "该 http 服务器的 range 支持不正常" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "连接服务器超时" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "内部错误" @@@ -2073,57 -2058,57 +2073,57 @@@ msgstr "无法 mmap %lu 字节的数据 msgid "Selection %s not found" msgstr "没有发现您的所选 %s" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "无法识别的类型缩写：“%c”" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "正在打开配置文件 %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "语法错误 %s:%u：配置小节没有以名字开头" --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "语法错误 %s:%u：标签格式有误" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "语法错误 %s:%u：太多的嵌套 include 命令" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "语法错误 %s:%u: Included from here" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "语法错误 %s:%u: 不支持的指令“%s”" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据" @@@ -2190,7 -2175,6 +2190,7 @@@ msgid "Unable to stat the mount point % msgstr "无法读取文件系统挂载点 %s 的状态" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "无法切换工作目录到 %s" @@@ -2437,7 -2421,7 +2437,7 @@@ msgstr " "少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::" "Force-LoopBreak 选项。" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "不支持索引文件类型“%s”" @@@ -2554,7 -2538,7 +2554,7 @@@ msgstr "处理 %s (UsePackage1)æ—¶å‡ºé” #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "处理 %s (NewFileVer1)时出错" #: apt-pkg/pkgcachegen.cc:178 @@@ -2584,7 -2568,7 +2584,7 @@@ msgstr "处理 %s (NewVersion2)æ—¶å‡ºé” #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "处理 %s (NewFileVer1)时出错" #: apt-pkg/pkgcachegen.cc:251 @@@ -2632,21 -2616,21 +2632,21 @@@ msgstr "正在收集文件所提供的è msgid "IO Error saving source cache" msgstr "无法写入来源缓存文件" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 key ID 没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@@ -2655,7 -2639,7 +2655,7 @@@ msgstr " "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@@ -2663,13 -2647,13 +2663,13 @@@ msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "大小不符" @@@ -2780,52 -2764,52 +2780,52 @@@ 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:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "正在删除 %s" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" diff --combined po/zh_TW.po index 211de9fce,9cb4895fc..35f14483e --- 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: 2007-07-09 01:22+1000\n" -"POT-Creation-Date: 2007-06-12 21:41+0200\n" ++"POT-Creation-Date: 2007-07-09 17:17+0100\n" "PO-Revision-Date: 2006-10-21 16:58+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@@ -159,7 -159,7 +159,7 @@@ msgstr " %4i %s\n #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 - #: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 -#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144 ++#: cmdline/apt-get.cc:2614 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" @@@ -652,7 -652,7 +652,7 @@@ msgstr "無法將 %s 更名為 %s msgid "Y" msgstr "Y" --#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 ++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示法出錯 - %s" @@@ -813,11 -813,11 +813,11 @@@ msgstr "有套件需要被移除,但移 msgid "Internal error, Ordering didn't finish" msgstr "內部錯誤，Ordering didn't finish" --#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 ++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" msgstr "無法鎖定下載的目錄" - #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331 ++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362 #: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "無法讀取來源單。" @@@ -846,7 -846,7 +846,7 @@@ msgstr "解壓縮後將消耗 %sB çš„ç© msgid "After unpacking %sB disk space will be freed.\n" msgstr "解壓縮後將空出 %sB 的空間。\n" - #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185 ++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s 無法足夠的空間。" @@@ -875,7 -875,7 +875,7 @@@ msgstr " "若要繼續的話,就輸入下面的句子“%s”\n" " ?] " - #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 ++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143 msgid "Abort." msgstr "放棄執行。" @@@ -883,7 -883,7 +883,7 @@@ msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " - #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228 ++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法下載『%s』檔案。%s\n" @@@ -892,7 -892,7 +892,7 @@@ msgid "Some files failed to download" msgstr "部份檔案無法下載" - #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237 ++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268 msgid "Download complete and in download only mode" msgstr "下載完畢,目前是“僅下載”模式" @@@ -1024,7 -1024,7 +1024,7 @@@ msgid " "shouldn't happen. Please file a bug report against apt." msgstr "" --#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 ++#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "底下的資訊有助於解決現在的情況:" @@@ -1037,31 -1037,31 +1037,31 @@@ msgstr "內部錯誤，problem resolve msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" --#: cmdline/apt-get.cc:1543 ++#: cmdline/apt-get.cc:1544 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "無法找到 %s 套件。" --#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 ++#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format msgid "Couldn't find package %s" msgstr "無法找到 %s 套件。" --#: cmdline/apt-get.cc:1681 ++#: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n" --#: cmdline/apt-get.cc:1711 ++#: cmdline/apt-get.cc:1712 #, fuzzy, c-format msgid "%s set to manual installed.\n" msgstr "但是『%s』卻將被安裝。" --#: cmdline/apt-get.cc:1724 ++#: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "用『apt-get -f install』指令或許能修正這些問題。" --#: cmdline/apt-get.cc:1727 ++#: cmdline/apt-get.cc:1728 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@@ -1069,7 -1069,7 +1069,7 @@@ msgstr " "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n" "定一個解決辦法)。" --#: cmdline/apt-get.cc:1739 ++#: cmdline/apt-get.cc:1740 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" @@@ -1080,7 -1080,7 +1080,7 @@@ msgstr " "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" "或從 Incoming 目錄移除。" --#: cmdline/apt-get.cc:1747 ++#: cmdline/apt-get.cc:1748 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" @@@ -1090,137 -1090,122 +1090,137 @@@ msgstr " "該套件無法安裝,您最好提交一個針對這個套件\n" "的臭蟲報告。" --#: cmdline/apt-get.cc:1755 ++#: cmdline/apt-get.cc:1756 msgid "Broken packages" msgstr "損毀的套件" --#: cmdline/apt-get.cc:1784 ++#: cmdline/apt-get.cc:1785 msgid "The following extra packages will be installed:" msgstr "下列的【新】套件都將被安裝：" --#: cmdline/apt-get.cc:1873 ++#: cmdline/apt-get.cc:1874 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" --#: cmdline/apt-get.cc:1874 ++#: cmdline/apt-get.cc:1875 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" --#: cmdline/apt-get.cc:1902 ++#: cmdline/apt-get.cc:1903 msgid "Calculating upgrade... " msgstr "籌畫升級套件中..." - #: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 -#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 ++#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "失敗" --#: cmdline/apt-get.cc:1910 ++#: cmdline/apt-get.cc:1911 msgid "Done" msgstr "完成" --#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 ++#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" msgstr "內部錯誤，problem resolver 處理失敗" --#: cmdline/apt-get.cc:2085 ++#: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個對應的套件才能下載源碼" - #: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 -#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349 ++#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 套件的源碼" - #: cmdline/apt-get.cc:2131 -#: cmdline/apt-get.cc:2164 ++#: cmdline/apt-get.cc:2132 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + - #: cmdline/apt-get.cc:2136 ++#: cmdline/apt-get.cc:2137 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + - #: cmdline/apt-get.cc:2194 ++#: cmdline/apt-get.cc:2195 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已被下載的檔案“%s”\n" - #: cmdline/apt-get.cc:2218 -#: cmdline/apt-get.cc:2188 ++#: cmdline/apt-get.cc:2219 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足夠的空間。" - #: cmdline/apt-get.cc:2223 -#: cmdline/apt-get.cc:2193 ++#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" - #: cmdline/apt-get.cc:2226 -#: cmdline/apt-get.cc:2196 ++#: cmdline/apt-get.cc:2227 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始檔案。\n" - #: cmdline/apt-get.cc:2232 -#: cmdline/apt-get.cc:2202 ++#: cmdline/apt-get.cc:2233 #, c-format msgid "Fetch source %s\n" msgstr "下載源碼 %s\n" - #: cmdline/apt-get.cc:2263 -#: cmdline/apt-get.cc:2233 ++#: cmdline/apt-get.cc:2264 msgid "Failed to fetch some archives." msgstr "無法下載某些檔案。" - #: cmdline/apt-get.cc:2291 -#: cmdline/apt-get.cc:2261 ++#: cmdline/apt-get.cc:2292 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" - #: cmdline/apt-get.cc:2303 -#: cmdline/apt-get.cc:2273 ++#: cmdline/apt-get.cc:2304 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" - #: cmdline/apt-get.cc:2304 -#: cmdline/apt-get.cc:2274 ++#: cmdline/apt-get.cc:2305 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是否安裝了“dpkg-dev”套件。\n" - #: cmdline/apt-get.cc:2321 -#: cmdline/apt-get.cc:2291 ++#: cmdline/apt-get.cc:2322 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" - #: cmdline/apt-get.cc:2340 -#: cmdline/apt-get.cc:2310 ++#: cmdline/apt-get.cc:2341 msgid "Child process failed" msgstr "子程序失敗" - #: cmdline/apt-get.cc:2356 -#: cmdline/apt-get.cc:2326 ++#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" - #: cmdline/apt-get.cc:2384 -#: cmdline/apt-get.cc:2354 ++#: cmdline/apt-get.cc:2385 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的建構相依關係。" - #: cmdline/apt-get.cc:2404 -#: cmdline/apt-get.cc:2374 ++#: cmdline/apt-get.cc:2405 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相依關係訊息。\n" - #: cmdline/apt-get.cc:2456 -#: cmdline/apt-get.cc:2426 ++#: cmdline/apt-get.cc:2457 #, 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:2508 -#: cmdline/apt-get.cc:2478 ++#: cmdline/apt-get.cc:2509 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@@ -1229,30 -1214,30 +1229,30 @@@ msgstr " "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" "相依關係" - #: cmdline/apt-get.cc:2543 -#: cmdline/apt-get.cc:2513 ++#: cmdline/apt-get.cc:2544 #, 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:2568 -#: cmdline/apt-get.cc:2538 ++#: cmdline/apt-get.cc:2569 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" - #: cmdline/apt-get.cc:2582 -#: cmdline/apt-get.cc:2552 ++#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所要求的建構相依關係。" - #: cmdline/apt-get.cc:2586 -#: cmdline/apt-get.cc:2556 ++#: cmdline/apt-get.cc:2587 msgid "Failed to process build dependencies" msgstr "無法處理建構相依關係" - #: cmdline/apt-get.cc:2618 -#: cmdline/apt-get.cc:2588 ++#: cmdline/apt-get.cc:2619 msgid "Supported modules:" msgstr "支援模組:" - #: cmdline/apt-get.cc:2659 -#: cmdline/apt-get.cc:2629 ++#: cmdline/apt-get.cc:2660 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@@ -1558,9 -1543,9 +1558,9 @@@ msgstr "複寫套件 %s 無符合版本 msgid "File %s/%s overwrites the one in the package %s" msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案" --#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 ++#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "無法讀取『%s』。" @@@ -1856,7 -1841,7 +1856,7 @@@ msgstr "Data socket 連線逾時 msgid "Unable to accept connection" msgstr "無法允許連線" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "問題雜湊表" @@@ -1883,39 -1868,39 +1883,39 @@@ msgstr "查詢 msgid "Unable to invoke " msgstr "無法讀取 " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "連絡『%s (%s)』中" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "無法建立到『%s』的 socket (族=%u 型=%u 協定=%u)。" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "無法聯絡到主機『%s:%s (%s)』。" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "無法聯絡到主機『%s:%s (%s)』。" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, 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:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "聯絡主機『%s』中" @@@ -1987,76 -1972,76 +1987,76 @@@ msgstr "無法開啟管線給 %s 使用 msgid "Read error from %s process" msgstr "從 %s 進程讀取錯誤" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "等待標頭" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "取得一個單行超過 %u 字元的標頭" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "壞的標頭" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http 伺服器傳送一個無效的回覆標頭" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http 伺服器傳送一個無效的 Content-Length 標頭" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http 伺服器傳送一個無效的 Content-Range 標頭" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http 伺服器有損毀的範圍支援" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select 失敗" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "寫入輸出檔時發生錯誤" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "從遠端主機讀取錯誤，關閉連線" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "從伺服器讀取發生錯誤" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "壞的標頭資料" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "內部錯誤" @@@ -2074,57 -2059,57 +2074,57 @@@ msgstr "無法讀入檔案 %lu ä½å…ƒçµ msgid "Selection %s not found" msgstr "選項『%s』找不到。" --#: apt-pkg/contrib/configuration.cc:433 ++#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "不認識的簡寫類型：%c" --#: apt-pkg/contrib/configuration.cc:491 ++#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "開啟組態檔 %s" --#: apt-pkg/contrib/configuration.cc:509 --#, c-format --msgid "Line %d too long (max %d)" ++#: apt-pkg/contrib/configuration.cc:510 ++#, fuzzy, c-format ++msgid "Line %d too long (max %lu)" msgstr "第 %d 行太長（最長 %d）" --#: apt-pkg/contrib/configuration.cc:605 ++#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "語法錯誤 %s:%u: 區塊沒有名稱" --#: apt-pkg/contrib/configuration.cc:624 ++#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "語法錯誤 %s:%u: 無效的標籤" --#: apt-pkg/contrib/configuration.cc:641 ++#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "語法錯誤 %s:%u: 值後有多餘的垃圾" --#: apt-pkg/contrib/configuration.cc:681 ++#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "語法錯誤： %s:%u： 指令只能於最高層級執行" --#: apt-pkg/contrib/configuration.cc:688 ++#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "語法錯誤 %s:%u: 太多重複引入檔案" --#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 ++#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "語法錯誤 %s:%u: 從此引入" --#: apt-pkg/contrib/configuration.cc:701 ++#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'" --#: apt-pkg/contrib/configuration.cc:735 ++#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾" @@@ -2191,7 -2176,6 +2191,7 @@@ msgid "Unable to stat the mount point % msgstr "無法讀取掛載點 %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "無法進入『%s』目錄。" @@@ -2437,7 -2421,7 +2437,7 @@@ msgstr " "此安裝因衝突或特別依存關係，需暫時刪除『%s』這個重要套件。這種情形通常有問" "題，但您確定的話請啟動『APT::Force-LoopBreak』選項。" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "本軟體不支持『%s』型的索引檔。" @@@ -2550,7 -2534,7 +2550,7 @@@ msgstr "處理『%s』時發生錯誤 ( #: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc1)" ++msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" #: apt-pkg/pkgcachegen.cc:178 @@@ -2580,7 -2564,7 +2580,7 @@@ msgstr "處理『%s』時發生錯誤 ( #: apt-pkg/pkgcachegen.cc:245 #, fuzzy, c-format --msgid "Error occured while processing %s (NewFileDesc2)" ++msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" #: apt-pkg/pkgcachegen.cc:251 @@@ -2628,41 -2612,41 +2628,41 @@@ msgstr "收集檔案供應 msgid "IO Error saving source cache" msgstr "無法寫入來源暫存檔。" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%s』更換失敗 (%s → %s)。" -#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 -#: apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5 檢查碼不符合。" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 key ID 沒有可用的公鑰：\n" -#: apt-pkg/acquire-item.cc:1219 +#: apt-pkg/acquire-item.cc:1270 #, 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:1278 +#: apt-pkg/acquire-item.cc:1329 #, 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:1314 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。" -#: apt-pkg/acquire-item.cc:1401 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "檔案大小不符合。" @@@ -2773,52 -2757,52 +2773,52 @@@ msgstr "寫入 %i 筆 %i å€‹ä¸åŒ¹é…æª msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n" -#: apt-pkg/deb/dpkgpm.cc:355 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "準備配置%s中" -#: apt-pkg/deb/dpkgpm.cc:356 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "解開%s中" -#: apt-pkg/deb/dpkgpm.cc:361 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "準備設定%s檔" -#: apt-pkg/deb/dpkgpm.cc:362 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "設定%s中" -#: apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "已安裝%s" -#: apt-pkg/deb/dpkgpm.cc:368 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "正在準備 %s 的刪除操作" -#: apt-pkg/deb/dpkgpm.cc:369 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "移除%s中" -#: apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "已移除%s" -#: apt-pkg/deb/dpkgpm.cc:375 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "準備完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:376 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "已完整移除%s"