From 9bfd7b57d82285fd99ae1ae6147c22af15fdbea0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 24 Feb 2013 16:20:43 +0100 Subject: * apt-pkg/depcache.cc: - prefer to install packages which have an already installed M-A:same sibling while choosing providers (LP: #1130419) --- apt-pkg/depcache.cc | 31 ++++++ debian/changelog | 5 + ...u-bug-1130419-prefer-installed-ma-same-siblings | 104 +++++++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100755 test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 2ec346f0b..a48cd8b0c 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -951,6 +951,37 @@ struct CompareProviders { { pkgCache::PkgIterator const A = AV.ParentPkg(); pkgCache::PkgIterator const B = BV.ParentPkg(); + // Prefer MA:same packages if other architectures for it are installed + if ((AV->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same || + (BV->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same) + { + bool instA = false; + if ((AV->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same) + { + pkgCache::GrpIterator Grp = A.Group(); + for (pkgCache::PkgIterator P = Grp.PackageList(); P.end() == false; P = Grp.NextPkg(P)) + if (P->CurrentVer != 0) + { + instA = true; + break; + } + } + bool instB = false; + if ((BV->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same) + { + pkgCache::GrpIterator Grp = B.Group(); + for (pkgCache::PkgIterator P = Grp.PackageList(); P.end() == false; P = Grp.NextPkg(P)) + { + if (P->CurrentVer != 0) + { + instB = true; + break; + } + } + } + if (instA != instB) + return instA == false; + } // Prefer packages in the same group as the target; e.g. foo:i386, foo:amd64 if (A->Group != B->Group) { diff --git a/debian/changelog b/debian/changelog index 8f9f4b97d..0531d0c85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,11 @@ apt (0.9.7.8) UNRELEASED; urgency=low * apt-pkg/indexrecords.cc: - support '\r' in the Release file + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - prefer to install packages which have an already installed M-A:same + sibling while choosing providers (LP: #1130419) + -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 apt (0.9.7.7) unstable; urgency=low diff --git a/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings b/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings new file mode 100755 index 000000000..af6b7b504 --- /dev/null +++ b/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings @@ -0,0 +1,104 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +insertpackage 'stable' 'libmesa' 'amd64,i386' '1' 'Multi-Arch: same' +insertpackage 'stable' 'libmesa-lts' 'amd64,i386' '1' 'Provides: libmesa +Conflicts: libmesa +Multi-Arch: same' +insertpackage 'stable' 'steam' 'i386' '1' 'Depends: libmesa' + +insertpackage 'unstable' 'libmesa' 'amd64,i386' '2' 'Multi-Arch: same' +insertpackage 'unstable' 'libmesa-lts' 'amd64,i386' '2' 'Provides: libmesa +Conflicts: libmesa +Multi-Arch: same' +insertpackage 'unstable' 'steam' 'i386' '2' 'Depends: libmesa' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libmesa:i386 +The following NEW packages will be installed: + libmesa:i386 steam:i386 +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libmesa:i386 (1 stable [i386]) +Inst steam:i386 (1 stable [i386]) +Conf libmesa:i386 (1 stable [i386]) +Conf steam:i386 (1 stable [i386])' aptget install steam -st stable +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libmesa:i386 +The following NEW packages will be installed: + libmesa:i386 steam:i386 +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libmesa:i386 (2 unstable [i386]) +Inst steam:i386 (2 unstable [i386]) +Conf libmesa:i386 (2 unstable [i386]) +Conf steam:i386 (2 unstable [i386])' aptget install steam -st unstable + +cp rootdir/var/lib/dpkg/status default-status.dpkg +insertinstalledpackage 'libmesa' 'amd64' '1' 'Multi-Arch: same' +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libmesa:i386 +The following NEW packages will be installed: + libmesa:i386 steam:i386 +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libmesa:i386 (1 stable [i386]) +Inst steam:i386 (1 stable [i386]) +Conf libmesa:i386 (1 stable [i386]) +Conf steam:i386 (1 stable [i386])' aptget install steam -st stable +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libmesa libmesa:i386 +The following NEW packages will be installed: + libmesa:i386 steam:i386 +The following packages will be upgraded: + libmesa +1 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libmesa [1] (2 unstable [amd64]) +Inst libmesa:i386 (2 unstable [i386]) +Inst steam:i386 (2 unstable [i386]) +Conf libmesa (2 unstable [amd64]) +Conf libmesa:i386 (2 unstable [i386]) +Conf steam:i386 (2 unstable [i386])' aptget install steam -st unstable + +cp default-status.dpkg rootdir/var/lib/dpkg/status +insertinstalledpackage 'libmesa-lts' 'amd64' '1' 'Provides: libmesa +Conflicts: libmesa +Multi-Arch: same' +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libmesa-lts:i386 +The following NEW packages will be installed: + libmesa-lts:i386 steam:i386 +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libmesa-lts:i386 (1 stable [i386]) +Inst steam:i386 (1 stable [i386]) +Conf libmesa-lts:i386 (1 stable [i386]) +Conf steam:i386 (1 stable [i386])' aptget install steam -st stable +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + libmesa-lts libmesa-lts:i386 +The following NEW packages will be installed: + libmesa-lts:i386 steam:i386 +The following packages will be upgraded: + libmesa-lts +1 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst libmesa-lts [1] (2 unstable [amd64]) +Inst libmesa-lts:i386 (2 unstable [i386]) +Inst steam:i386 (2 unstable [i386]) +Conf libmesa-lts (2 unstable [amd64]) +Conf libmesa-lts:i386 (2 unstable [i386]) +Conf steam:i386 (2 unstable [i386])' aptget install steam -st unstable -- cgit v1.2.3 From 3e2efdda0a8f577d571fcae15e9f4c3cebddfe30 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Mar 2013 14:55:19 +0100 Subject: releasing version 0.9.7.8~exp1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0531d0c85..97587b6bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.7.8) UNRELEASED; urgency=low +apt (0.9.7.8~exp1) experimental; urgency=low [ Manpages translation updates ] * Italian (Beatrice Torracca). Closes: #696601 @@ -39,7 +39,7 @@ apt (0.9.7.8) UNRELEASED; urgency=low - prefer to install packages which have an already installed M-A:same sibling while choosing providers (LP: #1130419) - -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 + -- Michael Vogt Fri, 01 Mar 2013 14:16:42 +0100 apt (0.9.7.7) unstable; urgency=low -- cgit v1.2.3 From 32fa71a57dcf625c94207dce612175af49c93ce4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Mar 2013 18:50:59 +0100 Subject: include two missing patches to really fix bug #696225, thanks to Guillem Jover --- apt-pkg/contrib/progress.cc | 2 +- debian/changelog | 7 +++++++ po/ca.po | 10 ++++++++++ po/cs.po | 10 ++++++++++ po/ru.po | 10 ++++++++++ 5 files changed, 38 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 17a6b70e9..916e1d730 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -192,7 +192,7 @@ void OpTextProgress::Update() } // Print the spinner - snprintf(S,sizeof(S),_("\r%s... %u%%"),Op.c_str(),(unsigned int)Percent); + snprintf(S,sizeof(S),_("%c%s... %u%%"),'\r',Op.c_str(),(unsigned int)Percent); Write(S); OldOp = Op; diff --git a/debian/changelog b/debian/changelog index 97587b6bf..ff4988d63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.7.8~exp2) UNRELEASEDexperimental; urgency=low + + * include two missing patches to really fix bug #696225, thanks to + Guillem Jover + + -- Michael Vogt Fri, 01 Mar 2013 18:50:17 +0100 + apt (0.9.7.8~exp1) experimental; urgency=low [ Manpages translation updates ] diff --git a/po/ca.po b/po/ca.po index 03d11e1aa..61d231277 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2403,6 +2403,16 @@ msgstr "%c%s… Error!" msgid "%c%s... Done" msgstr "%c%s… Fet" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "…" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." diff --git a/po/cs.po b/po/cs.po index 4ccb2f70b..3d16d6811 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2399,6 +2399,16 @@ msgstr "%c%s… Chyba!" msgid "%c%s... Done" msgstr "%c%s… Hotovo" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "…" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." diff --git a/po/ru.po b/po/ru.po index c60c9a384..9b66cc268 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2457,6 +2457,16 @@ msgstr "%c%s… Ошибка!" msgid "%c%s... Done" msgstr "%c%s… Готово" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "…" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." -- cgit v1.2.3 From fd6a8d0ddc14406bb6c0996b5bbaa95d6ccc1186 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Mar 2013 19:20:53 +0100 Subject: releasing version 0.9.7.8~exp2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b22712a4f..bfc4279b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -apt (0.9.7.8~exp2) UNRELEASEDexperimental; urgency=low +apt (0.9.7.8~exp2) experimental; urgency=low * include two missing patches to really fix bug #696225, thanks to Guillem Jover * ensure sha512 is really used when available, thanks to Tyler Hicks (LP: #1098752) - -- Michael Vogt Fri, 01 Mar 2013 18:50:17 +0100 + -- Michael Vogt Fri, 01 Mar 2013 19:06:55 +0100 apt (0.9.7.8~exp1) experimental; urgency=low -- cgit v1.2.3 From 69c2ecbdc937e3c73fe67d3c9bce12a80d3ec7ec Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 10 Mar 2013 12:24:13 +0100 Subject: various simple changes to fix cppcheck warnings --- apt-inst/extract.cc | 3 +-- apt-pkg/acquire-item.cc | 4 ++-- apt-pkg/aptconfiguration.cc | 2 +- apt-pkg/cachefilter.cc | 3 +-- apt-pkg/contrib/configuration.cc | 2 +- apt-pkg/contrib/fileutl.cc | 10 +++++----- apt-pkg/contrib/netrc.cc | 8 +++----- apt-pkg/contrib/strutl.cc | 8 ++++---- apt-pkg/deb/dpkgpm.cc | 17 +++++++---------- apt-pkg/indexcopy.cc | 6 ++---- apt-pkg/orderlist.cc | 4 +++- apt-pkg/pkgcache.cc | 18 +++++++++--------- apt-pkg/srcrecords.cc | 11 +++++------ apt-pkg/vendor.cc | 2 +- apt-pkg/versionmatch.cc | 2 +- cmdline/apt-get.cc | 4 ++-- debian/changelog | 7 +++++++ methods/rfc2553emu.cc | 2 -- 18 files changed, 55 insertions(+), 58 deletions(-) diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index 29e163028..2c95fba92 100644 --- a/apt-inst/extract.cc +++ b/apt-inst/extract.cc @@ -81,8 +81,6 @@ pkgExtract::pkgExtract(pkgFLCache &FLCache,pkgCache::VerIterator Ver) : /* This performs the setup for the extraction.. */ bool pkgExtract::DoItem(Item &Itm,int &Fd) { - char Temp[sizeof(FileName)]; - /* Strip any leading/trailing /s from the filename, then copy it to the temp buffer and re-apply the leading / We use a class variable to store the new filename for use by the three extraction funcs */ @@ -183,6 +181,7 @@ bool pkgExtract::DoItem(Item &Itm,int &Fd) // See if we can recover the backup file if (Nde.end() == false) { + char Temp[sizeof(FileName)]; snprintf(Temp,sizeof(Temp),"%s.%s",Itm.Name,TempExt); if (rename(Temp,Itm.Name) != 0 && errno != ENOENT) return _error->Errno("rename",_("Failed to rename %s to %s"), diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index a71886a87..6ad10e26e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -560,7 +560,7 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, Desc.Owner = this; Desc.ShortDesc = ShortDesc; - if(available_patches.size() == 0) + if(available_patches.empty() == true) { // we are done (yeah!) Finish(true); @@ -1643,7 +1643,7 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, assumption here that all the available sources for this version share the same extension.. */ // Skip not source sources, they do not have file fields. - for (; Vf.end() == false; Vf++) + for (; Vf.end() == false; ++Vf) { if ((Vf.File()->Flags & pkgCache::Flag::NotSource) != 0) continue; diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 653775688..37c846582 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -401,8 +401,8 @@ std::vector const Configuration::getArchitectures(bool const &Cache close(external[1]); FILE *dpkg = fdopen(external[0], "r"); - char buf[1024]; if(dpkg != NULL) { + char buf[1024]; while (fgets(buf, sizeof(buf), dpkg) != NULL) { char* arch = strtok(buf, " "); while (arch != NULL) { diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc index 58cc812bf..64cde41d1 100644 --- a/apt-pkg/cachefilter.cc +++ b/apt-pkg/cachefilter.cc @@ -71,8 +71,7 @@ static std::string CompleteArch(std::string const &arch) { } /*}}}*/ PackageArchitectureMatchesSpecification::PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern) :/*{{{*/ - literal(pattern), isPattern(isPattern), d(NULL) { - complete = CompleteArch(pattern); + literal(pattern), complete(CompleteArch(pattern)), isPattern(isPattern), d(NULL) { } /*}}}*/ bool PackageArchitectureMatchesSpecification::operator() (char const * const &arch) {/*{{{*/ diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 4de17e3e1..808a708a1 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -958,7 +958,7 @@ Configuration::MatchAgainstConfig::MatchAgainstConfig(char const * Config) continue; } } - if (strings.size() == 0) + if (strings.empty() == true) patterns.push_back(NULL); } /*}}}*/ diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 90e49cbfa..f18e17005 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -387,7 +387,7 @@ std::vector GetListOfFilesInDir(string const &Dir, std::vector c std::vector List; - if (DirectoryExists(Dir.c_str()) == false) + if (DirectoryExists(Dir) == false) { _error->Error(_("List of files can't be created as '%s' is not a directory"), Dir.c_str()); return List; @@ -413,14 +413,14 @@ std::vector GetListOfFilesInDir(string const &Dir, std::vector c if (Ent->d_type != DT_REG) #endif { - if (RealFileExists(File.c_str()) == false) + if (RealFileExists(File) == false) { // do not show ignoration warnings for directories if ( #ifdef _DIRENT_HAVE_D_TYPE Ent->d_type == DT_DIR || #endif - DirectoryExists(File.c_str()) == true) + DirectoryExists(File) == true) continue; if (SilentIgnore.Match(Ent->d_name) == false) _error->Notice(_("Ignoring '%s' in directory '%s' as it is not a regular file"), Ent->d_name, Dir.c_str()); @@ -501,7 +501,7 @@ std::vector GetListOfFilesInDir(string const &Dir, bool SortList) std::vector List; - if (DirectoryExists(Dir.c_str()) == false) + if (DirectoryExists(Dir) == false) { _error->Error(_("List of files can't be created as '%s' is not a directory"), Dir.c_str()); return List; @@ -526,7 +526,7 @@ std::vector GetListOfFilesInDir(string const &Dir, bool SortList) if (Ent->d_type != DT_REG) #endif { - if (RealFileExists(File.c_str()) == false) + if (RealFileExists(File) == false) { if (Debug == true) std::clog << "Bad file: " << Ent->d_name << " → it is not a real file" << std::endl; diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index 0a902f126..de95aa4ab 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -50,14 +50,10 @@ static int parsenetrc_string (char *host, std::string &login, std::string &passw FILE *file; int retcode = 1; int specific_login = (login.empty() == false); - char *home = NULL; bool netrc_alloc = false; - int state_our_login = false; /* With specific_login, - found *our* login name */ - if (!netrcfile) { - home = getenv ("HOME"); /* portable environment reader */ + char const * home = getenv ("HOME"); /* portable environment reader */ if (!home) { struct passwd *pw; @@ -86,6 +82,8 @@ static int parsenetrc_string (char *host, std::string &login, std::string &passw int state = NOTHING; char state_login = 0; /* Found a login keyword */ char state_password = 0; /* Found a password keyword */ + int state_our_login = false; /* With specific_login, + found *our* login name */ while (!done && getline(&netrcbuffer, &netrcbuffer_size, file) != -1) { tok = strtok_r (netrcbuffer, " \t\n", &tok_buf); diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index ca096d736..f643db451 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1246,7 +1246,7 @@ string StripEpoch(const string &VerStr) return VerStr; return VerStr.substr(i+1); } - + /*}}}*/ // tolower_ascii - tolower() function that ignores the locale /*{{{*/ // --------------------------------------------------------------------- /* This little function is the most called method we have and tries @@ -1284,14 +1284,14 @@ bool CheckDomainList(const string &Host,const string &List) return false; } /*}}}*/ -// DeEscapeString - unescape (\0XX and \xXX) from a string /*{{{*/ +// DeEscapeString - unescape (\0XX and \xXX) from a string /*{{{*/ // --------------------------------------------------------------------- /* */ string DeEscapeString(const string &input) { char tmp[3]; - string::const_iterator it, escape_start; - string output, octal, hex; + string::const_iterator it; + string output; for (it = input.begin(); it != input.end(); ++it) { // just copy non-escape chars diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 6cb8bc6b6..3bc31dc37 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -147,11 +147,11 @@ static pkgCache::VerIterator FindNowVersion(const pkgCache::PkgIterator &Pkg) { pkgCache::VerIterator Ver; - for (Ver = Pkg.VersionList(); Ver.end() == false; Ver++) + for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) { pkgCache::VerFileIterator Vf = Ver.FileList(); pkgCache::PkgFileIterator F = Vf.File(); - for (F = Vf.File(); F.end() == false; F++) + for (F = Vf.File(); F.end() == false; ++F) { if (F && F.Archive()) { @@ -1585,12 +1585,12 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) if (!logfile_name.empty()) { FILE *log = NULL; - char buf[1024]; fprintf(report, "DpkgTerminalLog:\n"); log = fopen(logfile_name.c_str(),"r"); if(log != NULL) { + char buf[1024]; while( fgets(buf, sizeof(buf), log) != NULL) fprintf(report, " %s", buf); fclose(log); @@ -1609,13 +1609,11 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) // attach dmesg log (to learn about segfaults) if (FileExists("/bin/dmesg")) { - FILE *log = NULL; - char buf[1024]; - fprintf(report, "Dmesg:\n"); - log = popen("/bin/dmesg","r"); + FILE *log = popen("/bin/dmesg","r"); if(log != NULL) { + char buf[1024]; while( fgets(buf, sizeof(buf), log) != NULL) fprintf(report, " %s", buf); pclose(log); @@ -1625,13 +1623,12 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) // attach df -l log (to learn about filesystem status) if (FileExists("/bin/df")) { - FILE *log = NULL; - char buf[1024]; fprintf(report, "Df:\n"); - log = popen("/bin/df -l","r"); + FILE *log = popen("/bin/df -l","r"); if(log != NULL) { + char buf[1024]; while( fgets(buf, sizeof(buf), log) != NULL) fprintf(report, " %s", buf); pclose(log); diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index aa1f01a4a..6e35fc40e 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -141,7 +141,6 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector &List, File = OrigPath + ChopDirs(File,Chop); // See if the file exists - bool Mangled = false; if (NoStat == false || Hits < 10) { // Attempt to fix broken structure @@ -164,6 +163,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector &List, if (stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0 || Buf.st_size == 0) { + bool Mangled = false; // Attempt to fix busted symlink support for one instance string OrigFile = File; string::size_type Start = File.find("binary-"); @@ -799,9 +799,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ unsigned int WrongSize = 0; unsigned int Packages = 0; for (vector::iterator I = List.begin(); I != List.end(); ++I) - { - string OrigPath = string(*I,CDROM.length()); - + { // Open the package file FileFd Pkg(*I, FileFd::ReadOnly, FileFd::Auto); off_t const FileSize = Pkg.Size(); diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 3a179b2a2..80d8fd490 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -331,9 +331,11 @@ int pkgOrderList::Score(PkgIterator Pkg) } // Important Required Standard Optional Extra - signed short PrioMap[] = {0,5,4,3,1,0}; if (Cache[Pkg].InstVerIter(Cache)->Priority <= 5) + { + signed short PrioMap[] = {0,5,4,3,1,0}; Score += PrioMap[Cache[Pkg].InstVerIter(Cache)->Priority]; + } return Score; } /*}}}*/ diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 1de33ff9b..1378876fe 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -279,22 +279,22 @@ pkgCache::GrpIterator pkgCache::FindGrp(const string &Name) { type in the weird debian style.. */ const char *pkgCache::CompTypeDeb(unsigned char Comp) { - const char *Ops[] = {"","<=",">=","<<",">>","=","!="}; - if ((unsigned)(Comp & 0xF) < 7) - return Ops[Comp & 0xF]; - return ""; + const char * const Ops[] = {"","<=",">=","<<",">>","=","!="}; + if (unlikely((unsigned)(Comp & 0xF) >= sizeof(Ops)/sizeof(Ops[0]))) + return ""; + return Ops[Comp & 0xF]; } /*}}}*/ // Cache::CompType - Return a string describing the compare type /*{{{*/ // --------------------------------------------------------------------- -/* This returns a string representation of the dependency compare +/* This returns a string representation of the dependency compare type */ const char *pkgCache::CompType(unsigned char Comp) { - const char *Ops[] = {"","<=",">=","<",">","=","!="}; - if ((unsigned)(Comp & 0xF) < 7) - return Ops[Comp & 0xF]; - return ""; + const char * const Ops[] = {"","<=",">=","<",">","=","!="}; + if (unlikely((unsigned)(Comp & 0xF) >= sizeof(Ops)/sizeof(Ops[0]))) + return ""; + return Ops[Comp & 0xF]; } /*}}}*/ // Cache::DepType - Return a string describing the dep type /*{{{*/ diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index d63d2c422..297559957 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -42,7 +42,7 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : d(NULL), Files(0), Current(0 } // Doesn't work without any source index files - if (Files.size() == 0) + if (Files.empty() == true) { _error->Error(_("You must put some 'source' URIs" " in your sources.list")); @@ -121,14 +121,13 @@ pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool const &SrcOn /* */ const char *pkgSrcRecords::Parser::BuildDepType(unsigned char const &Type) { - const char *fields[] = {"Build-Depends", - "Build-Depends-Indep", + const char *fields[] = {"Build-Depends", + "Build-Depends-Indep", "Build-Conflicts", "Build-Conflicts-Indep"}; - if (Type < 4) - return fields[Type]; - else + if (unlikely(Type >= sizeof(fields)/sizeof(fields[0]))) return ""; + return fields[Type]; } /*}}}*/ diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc index 36fc25957..fc03ec845 100644 --- a/apt-pkg/vendor.cc +++ b/apt-pkg/vendor.cc @@ -12,7 +12,7 @@ Vendor::Vendor(std::string VendorID, this->VendorID = VendorID; this->Origin = Origin; for (std::vector::iterator I = FingerprintList->begin(); - I != FingerprintList->end(); I++) + I != FingerprintList->end(); ++I) { if (_config->FindB("Debug::Vendor", false)) std::cerr << "Vendor \"" << VendorID << "\": Mapping \"" diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index e4fa0ea65..26262a010 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -181,9 +181,9 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg) bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string) { if (pattern[0] == '/') { - bool res = false; size_t length = strlen(pattern); if (pattern[length - 1] == '/') { + bool res = false; regex_t preg; char *regex = strdup(pattern + 1); regex[length - 2] = '\0'; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index e3c74a099..5e6f50d41 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1912,7 +1912,6 @@ bool DoInstall(CommandLine &CmdL) return false; } - unsigned short const order[] = { MOD_REMOVE, MOD_INSTALL, 0 }; TryToInstall InstallAction(Cache, Fix, BrokenFix); TryToRemove RemoveAction(Cache, Fix); @@ -1920,6 +1919,7 @@ bool DoInstall(CommandLine &CmdL) // new scope for the ActionGroup { pkgDepCache::ActionGroup group(Cache); + unsigned short const order[] = { MOD_REMOVE, MOD_INSTALL, 0 }; for (unsigned short i = 0; order[i] != 0; ++i) { @@ -2023,7 +2023,7 @@ bool DoInstall(CommandLine &CmdL) /* Print out a list of suggested and recommended packages */ { - string SuggestsList, RecommendsList, List; + string SuggestsList, RecommendsList; string SuggestsVersions, RecommendsVersions; for (unsigned J = 0; J < Cache->Head().PackageCount; J++) { diff --git a/debian/changelog b/debian/changelog index bfc4279b3..067103c72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.7.8~exp2+nmu1) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * various simple changes to fix cppcheck warnings + + -- David Kalnischkies Sun, 10 Mar 2013 12:23:24 +0100 + apt (0.9.7.8~exp2) experimental; urgency=low * include two missing patches to really fix bug #696225, thanks to diff --git a/methods/rfc2553emu.cc b/methods/rfc2553emu.cc index f00e85889..372882769 100644 --- a/methods/rfc2553emu.cc +++ b/methods/rfc2553emu.cc @@ -154,11 +154,9 @@ int getaddrinfo(const char *nodename, const char *servname, /* */ void freeaddrinfo(struct addrinfo *ai) { - struct addrinfo *Tmp; while (ai != 0) { free(ai->ai_addr); - Tmp = ai; ai = ai->ai_next; free(ai); } -- cgit v1.2.3 From a65e22c64a9312dec90264b4059424dbe2290d7b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 12 Mar 2013 23:28:16 +0100 Subject: * apt-pkg/pkgcachegen.cc: - do not store the MD5Sum for every description language variant as it will be the same for all so it can be shared to save cache space --- apt-pkg/pkgcachegen.cc | 61 ++++++++++++++++++++++++++------------------------ debian/changelog | 3 +++ 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 373f6625c..2f05310c1 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -300,36 +300,35 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) { - pkgCache::DescIterator Desc = Ver.DescriptionList(); + pkgCache::DescIterator VerDesc = Ver.DescriptionList(); // a version can only have one md5 describing it - if (Desc.end() == true || MD5SumValue(Desc.md5()) != CurMd5) + if (VerDesc.end() == true || MD5SumValue(VerDesc.md5()) != CurMd5) continue; // don't add a new description if we have one for the given // md5 && language - if (IsDuplicateDescription(Desc, CurMd5, CurLang) == true) + if (IsDuplicateDescription(VerDesc, CurMd5, CurLang) == true) continue; + pkgCache::DescIterator Desc; Dynamic DynDesc(Desc); - // we add at the end, so that the start is constant as we need - // that to be able to efficiently share these lists - map_ptrloc *LastDesc = &Ver->DescriptionList; - for (;Desc.end() == false && Desc->NextDesc != 0; ++Desc); - if (Desc.end() == false) - LastDesc = &Desc->NextDesc; - void const * const oldMap = Map.Data(); - map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, *LastDesc); + map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, VerDesc->md5sum); if (unlikely(descindex == 0 && _error->PendingError())) return _error->Error(_("Error occurred while processing %s (%s%d)"), Pkg.Name(), "NewDescription", 1); - if (oldMap != Map.Data()) - LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; - *LastDesc = descindex; + Desc->ParentPkg = Pkg.Index(); - if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false) + // we add at the end, so that the start is constant as we need + // that to be able to efficiently share these lists + VerDesc = Ver.DescriptionList(); // old value might be invalid after ReMap + for (;VerDesc.end() == false && VerDesc->NextDesc != 0; ++VerDesc); + map_ptrloc * const LastNextDesc = (VerDesc.end() == true) ? &Ver->DescriptionList : &VerDesc->NextDesc; + *LastNextDesc = descindex; + + if (NewFileDesc(Desc,List) == false) return _error->Error(_("Error occurred while processing %s (%s%d)"), Pkg.Name(), "NewFileDesc", 1); @@ -509,19 +508,16 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator // We haven't found reusable descriptions, so add the first description pkgCache::DescIterator Desc = Ver.DescriptionList(); Dynamic DynDesc(Desc); - map_ptrloc *LastDesc = &Ver->DescriptionList; - oldMap = Map.Data(); - map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, *LastDesc); + map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, 0); if (unlikely(descindex == 0 && _error->PendingError())) return _error->Error(_("Error occurred while processing %s (%s%d)"), Pkg.Name(), "NewDescription", 2); - if (oldMap != Map.Data()) - LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; - *LastDesc = descindex; + Desc->ParentPkg = Pkg.Index(); + Ver->DescriptionList = descindex; - if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false) + if (NewFileDesc(Desc,List) == false) return _error->Error(_("Error occurred while processing %s (%s%d)"), Pkg.Name(), "NewFileDesc", 2); @@ -825,9 +821,9 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, // --------------------------------------------------------------------- /* This puts a description structure in the linked list */ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, - const string &Lang, - const MD5SumValue &md5sum, - map_ptrloc Next) + const string &Lang, + const MD5SumValue &md5sum, + map_ptrloc idxmd5str) { // Get a structure map_ptrloc const Description = AllocateInMap(sizeof(pkgCache::Description)); @@ -836,14 +832,21 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, // Fill it in Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description); - Desc->NextDesc = Next; Desc->ID = Cache.HeaderP->DescriptionCount++; map_ptrloc const idxlanguage_code = WriteStringInMap(Lang); - map_ptrloc const idxmd5sum = WriteStringInMap(md5sum.Value()); - if (unlikely(idxlanguage_code == 0 || idxmd5sum == 0)) + if (unlikely(idxlanguage_code == 0)) return 0; Desc->language_code = idxlanguage_code; - Desc->md5sum = idxmd5sum; + + if (idxmd5str != 0) + Desc->md5sum = idxmd5str; + else + { + map_ptrloc const idxmd5sum = WriteStringInMap(md5sum.Value()); + if (unlikely(idxmd5sum == 0)) + return 0; + Desc->md5sum = idxmd5sum; + } return Description; } diff --git a/debian/changelog b/debian/changelog index 067103c72..58cff6822 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ apt (0.9.7.8~exp2+nmu1) UNRELEASED; urgency=low [ David Kalnischkies ] * various simple changes to fix cppcheck warnings + * apt-pkg/pkgcachegen.cc: + - do not store the MD5Sum for every description language variant as + it will be the same for all so it can be shared to save cache space -- David Kalnischkies Sun, 10 Mar 2013 12:23:24 +0100 -- cgit v1.2.3 From 734b7c817a54e2717bc9124a691be532d881a65b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 12 Mar 2013 23:47:48 +0100 Subject: handle language tags for descriptions are unique strings to be shared --- apt-pkg/pkgcachegen.cc | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 2f05310c1..d14a7af1c 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -833,7 +833,7 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, // Fill it in Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description); Desc->ID = Cache.HeaderP->DescriptionCount++; - map_ptrloc const idxlanguage_code = WriteStringInMap(Lang); + map_ptrloc const idxlanguage_code = WriteUniqString(Lang); if (unlikely(idxlanguage_code == 0)) return 0; Desc->language_code = idxlanguage_code; diff --git a/debian/changelog b/debian/changelog index 58cff6822..9578ec8fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.9.7.8~exp2+nmu1) UNRELEASED; urgency=low * apt-pkg/pkgcachegen.cc: - do not store the MD5Sum for every description language variant as it will be the same for all so it can be shared to save cache space + - handle language tags for descriptions are unique strings to be shared -- David Kalnischkies Sun, 10 Mar 2013 12:23:24 +0100 -- cgit v1.2.3 From 9c44383f2ea09afbf6ebab217cdc450e5170c172 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 13 Mar 2013 19:00:19 +0100 Subject: factor version string creation out of NewDepends, so we can easily reuse version strings e.g. for implicit multi-arch dependencies --- apt-pkg/pkgcachegen.cc | 57 +++++++++++++++++++++++++++----------------------- apt-pkg/pkgcachegen.h | 3 +++ debian/changelog | 2 ++ 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index d14a7af1c..01aaf6164 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -463,11 +463,8 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator pkgCache::VerIterator ConVersion = D.ParentVer(); Dynamic DynV(ConVersion); // duplicate the Conflicts/Breaks/Replaces for :none arch - if (D->Version == 0) - NewDepends(Pkg, ConVersion, "", 0, D->Type, OldDepLast); - else - NewDepends(Pkg, ConVersion, D.TargetVer(), - D->CompareOp, D->Type, OldDepLast); + NewDepends(Pkg, ConVersion, D->Version, + D->CompareOp, D->Type, OldDepLast); } } } @@ -671,6 +668,7 @@ bool pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator &G, bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same); pkgCache::PkgIterator D = G.PackageList(); Dynamic DynD(D); + map_ptrloc const VerStrIdx = V->VerStr; for (; D.end() != true; D = G.NextPkg(D)) { if (Arch == D.Arch() || D->VersionList == 0) @@ -681,16 +679,16 @@ bool pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator &G, if (coInstall == true) { // Replaces: ${self}:other ( << ${binary:Version}) - NewDepends(D, V, V.VerStr(), + NewDepends(D, V, VerStrIdx, pkgCache::Dep::Less, pkgCache::Dep::Replaces, OldDepLast); // Breaks: ${self}:other (!= ${binary:Version}) - NewDepends(D, V, V.VerStr(), + NewDepends(D, V, VerStrIdx, pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks, OldDepLast); } else { // Conflicts: ${self}:other - NewDepends(D, V, "", + NewDepends(D, V, 0, pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, OldDepLast); } @@ -707,17 +705,18 @@ bool pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator &V, bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same); if (coInstall == true) { + map_ptrloc const VerStrIdx = V->VerStr; // Replaces: ${self}:other ( << ${binary:Version}) - NewDepends(D, V, V.VerStr(), + NewDepends(D, V, VerStrIdx, pkgCache::Dep::Less, pkgCache::Dep::Replaces, OldDepLast); // Breaks: ${self}:other (!= ${binary:Version}) - NewDepends(D, V, V.VerStr(), + NewDepends(D, V, VerStrIdx, pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks, OldDepLast); } else { // Conflicts: ${self}:other - NewDepends(D, V, "", + NewDepends(D, V, 0, pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, OldDepLast); } @@ -861,35 +860,41 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, unsigned int const &Op, unsigned int const &Type, map_ptrloc* &OldDepLast) +{ + map_ptrloc index = 0; + if (Version.empty() == false) + { + void const * const oldMap = Map.Data(); + index = WriteStringInMap(Version); + if (unlikely(index == 0)) + return false; + if (oldMap != Map.Data()) + OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + } + return NewDepends(Pkg, Ver, index, Op, Type, OldDepLast); +} +bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver, + map_ptrloc const Version, + unsigned int const &Op, + unsigned int const &Type, + map_ptrloc* &OldDepLast) { void const * const oldMap = Map.Data(); // Get a structure map_ptrloc const Dependency = AllocateInMap(sizeof(pkgCache::Dependency)); if (unlikely(Dependency == 0)) return false; - + // Fill it in pkgCache::DepIterator Dep(Cache,Cache.DepP + Dependency); Dynamic DynDep(Dep); Dep->ParentVer = Ver.Index(); Dep->Type = Type; Dep->CompareOp = Op; + Dep->Version = Version; Dep->ID = Cache.HeaderP->DependsCount++; - // Probe the reverse dependency list for a version string that matches - if (Version.empty() == false) - { -/* for (pkgCache::DepIterator I = Pkg.RevDependsList(); I.end() == false; I++) - if (I->Version != 0 && I.TargetVer() == Version) - Dep->Version = I->Version;*/ - if (Dep->Version == 0) { - map_ptrloc const index = WriteStringInMap(Version); - if (unlikely(index == 0)) - return false; - Dep->Version = index; - } - } - // Link it to the package Dep->Package = Pkg.Index(); Dep->NextRevDepends = Pkg->RevDepends; diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index b6259b433..e759cbd3e 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -77,6 +77,9 @@ class pkgCacheGenerator /*{{{*/ bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver, std::string const &Version, unsigned int const &Op, unsigned int const &Type, map_ptrloc* &OldDepLast); + bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver, + map_ptrloc const Version, unsigned int const &Op, + unsigned int const &Type, map_ptrloc* &OldDepLast); unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,unsigned long Next); map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang,const MD5SumValue &md5sum,map_ptrloc Next); diff --git a/debian/changelog b/debian/changelog index 9578ec8fd..7796f5920 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.9.7.8~exp2+nmu1) UNRELEASED; urgency=low - do not store the MD5Sum for every description language variant as it will be the same for all so it can be shared to save cache space - handle language tags for descriptions are unique strings to be shared + - factor version string creation out of NewDepends, so we can easily reuse + version strings e.g. for implicit multi-arch dependencies -- David Kalnischkies Sun, 10 Mar 2013 12:23:24 +0100 -- cgit v1.2.3 From 55971004215609a02ca19c59bd058da20729ba11 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 14 Mar 2013 14:26:43 +0100 Subject: * SECURITY UPDATE: InRelease verification bypass - CVE-2013-1051 * apt-pkg/deb/debmetaindex.cc, test/integration/test-bug-595691-empty-and-broken-archive-files, test/integration/test-releasefile-verification: - disable InRelease downloading until the verification issue is fixed, thanks to Ansgar Burchardt for finding the flaw --- apt-pkg/deb/debmetaindex.cc | 21 +- configure.in | 2 +- debian/changelog | 14 + debian/control | 4 +- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 4 +- po/apt-all.pot | 182 +++++----- po/ar.po | 180 +++++----- po/ast.po | 180 +++++----- po/bg.po | 180 +++++----- po/bs.po | 180 +++++----- po/ca.po | 238 +++++++------ po/cs.po | 180 +++++----- po/cy.po | 180 +++++----- po/da.po | 180 +++++----- po/de.po | 180 +++++----- po/dz.po | 180 +++++----- po/el.po | 180 +++++----- po/es.po | 180 +++++----- po/eu.po | 180 +++++----- po/fi.po | 180 +++++----- po/fr.po | 395 +++++++++++---------- po/gl.po | 180 +++++----- po/hu.po | 180 +++++----- po/it.po | 180 +++++----- po/ja.po | 180 +++++----- po/km.po | 180 +++++----- po/ko.po | 180 +++++----- po/ku.po | 180 +++++----- po/lt.po | 180 +++++----- po/mr.po | 180 +++++----- po/nb.po | 180 +++++----- po/ne.po | 180 +++++----- po/nl.po | 180 +++++----- po/nn.po | 180 +++++----- po/pl.po | 180 +++++----- po/pt.po | 180 +++++----- po/pt_BR.po | 180 +++++----- po/ro.po | 180 +++++----- po/ru.po | 180 +++++----- po/sk.po | 180 +++++----- po/sl.po | 180 +++++----- po/sv.po | 180 +++++----- po/th.po | 180 +++++----- po/tl.po | 180 +++++----- po/uk.po | 180 +++++----- po/vi.po | 180 +++++----- po/zh_CN.po | 180 +++++----- po/zh_TW.po | 180 +++++----- .../test-bug-595691-empty-and-broken-archive-files | 30 +- test/integration/test-releasefile-verification | 4 +- 51 files changed, 4108 insertions(+), 3988 deletions(-) diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index bcc617da7..6c191fd95 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -236,16 +236,23 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, (*Target)->ShortDesc, HashString()); } + + // this is normally created in pkgAcqMetaSig, but if we run + // in --print-uris mode, we add it here + new pkgAcqMetaIndex(Owner, MetaIndexURI("Release"), + MetaIndexInfo("Release"), "Release", + MetaIndexURI("Release.gpg"), + ComputeIndexTargets(), + new indexRecords (Dist)); } - new pkgAcqMetaClearSig(Owner, MetaIndexURI("InRelease"), - MetaIndexInfo("InRelease"), "InRelease", - MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release", - MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg", - ComputeIndexTargets(), - new indexRecords (Dist)); + new pkgAcqMetaSig(Owner, MetaIndexURI("Release.gpg"), + MetaIndexInfo("Release.gpg"), "Release.gpg", + MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release", + ComputeIndexTargets(), + new indexRecords (Dist)); - return true; + return true; } void debReleaseIndex::SetTrusted(bool const Trusted) diff --git a/configure.in b/configure.in index be3634abe..84b6d1b24 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.7.7" +PACKAGE_VERSION="0.9.7.8" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index 891c4f9da..9ed9b4d61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +apt (0.9.7.8) unstable; urgency=criticial + + * SECURITY UPDATE: InRelease verification bypass + - CVE-2013-1051 + + [ David Kalnischk ] + * apt-pkg/deb/debmetaindex.cc, + test/integration/test-bug-595691-empty-and-broken-archive-files, + test/integration/test-releasefile-verification: + - disable InRelease downloading until the verification issue is + fixed, thanks to Ansgar Burchardt for finding the flaw + + -- Michael Vogt Thu, 14 Mar 2013 07:47:36 +0100 + apt (0.9.7.7) unstable; urgency=low [ Program translation updates ] diff --git a/debian/control b/debian/control index 762d2818e..50b3599fc 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ +Vcs-Bzr: http://bzr.debian.org/apt/debian-wheezy/ +Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-wheezy/ Package: apt Architecture: any diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 98d864818..f3885ef7c 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -213,7 +213,7 @@ "> - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 78c21907a..99cb3dfca 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.7.5\n" +"Project-Id-Version: apt-doc 0.9.7.8\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0300\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/apt-all.pot b/po/apt-all.pot index 205cfe72c..690908054 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 0.9.7.5\n" +"Project-Id-Version: apt 0.9.7.8\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -152,7 +152,7 @@ msgid " Version table:" msgstr "" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -425,7 +425,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "" @@ -532,8 +532,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -543,15 +543,17 @@ msgstr "" msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -559,46 +561,46 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -608,35 +610,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -652,15 +654,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -669,7 +671,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -677,27 +679,27 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -705,85 +707,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -791,141 +793,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -971,7 +973,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1538,7 +1540,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "" @@ -2506,19 +2508,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2547,7 +2549,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2686,21 +2688,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "" diff --git a/po/ar.po b/po/ar.po index 30bdc404a..010860af2 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " جدول النسخ:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -435,7 +435,7 @@ msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يم msgid "%s is already the newest version.\n" msgstr "%s هي النسخة الأحدث.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" @@ -542,8 +542,8 @@ msgstr "بعد الاستخراج %sب من المساحة الإضافيّة س msgid "After this operation, %sB disk space will be freed.\n" msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" @@ -553,15 +553,17 @@ msgstr "تعذر حساب المساحة الحرة في %s" msgid "You don't have enough free space in %s." msgstr "ليس هناك مساحة كافية في %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "نعم، افعل ما أقوله!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -572,28 +574,28 @@ msgstr "" "كي تستمر اكتب العبارة '%s'\n" " ؟] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "إجهاض." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "فشل تنزيل بعض الملفات" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -601,19 +603,19 @@ msgstr "" "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --" "fix-missing؟" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "تعذر تصحيح الحزم المفقودة." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "إجهاض التثبيت." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -623,35 +625,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "لا يقبل الأمر update أية مُعطيات" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -667,16 +669,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "قد تساعد المعلومات التالية في حل المشكلة:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -686,7 +688,7 @@ msgid_plural "" msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:" msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -694,28 +696,28 @@ msgid_plural "" msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:" msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -723,85 +725,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "حزم معطوبة" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "الحزم المقترحة:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "الحزم المستحسنة:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "فشل" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "تمّ" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -809,141 +811,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -989,7 +991,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1565,7 +1567,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "تعذرت الكتابة إلى %s" @@ -2537,19 +2539,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "فشل إغلاق الملف %s" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2578,7 +2580,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2717,21 +2719,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "قراءة قوائم الحزم" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "" diff --git a/po/ast.po b/po/ast.po index 45a03b2aa..df41c82cc 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -152,7 +152,7 @@ msgid " Version table:" msgstr " Tabla de versiones:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -481,7 +481,7 @@ msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n" msgid "%s is already the newest version.\n" msgstr "%s yá ta na versión más nueva.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s axustáu como instaláu manualmente.\n" @@ -588,8 +588,8 @@ msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" @@ -599,15 +599,17 @@ msgstr "Nun pue determinase l'espaciu llibre de %s" msgid "You don't have enough free space in %s." msgstr "Nun tienes espaciu libre bastante en %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Conseñose Trivial Only pero ésta nun ye una operación trivial." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Sí, ¡facer lo que digo!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -618,28 +620,28 @@ msgstr "" "Pa continuar escribe la frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Encaboxar." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "¿Quies continuar [S/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Dellos ficheros nun pudieron descargase" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de sólo descarga" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -647,19 +649,19 @@ msgstr "" "Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o " "tentando --fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Nun pudieron iguase los paquetes que falten." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Encaboxando la instalación." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -673,35 +675,35 @@ msgstr[1] "" "Los siguientes paquetes desaparecieron del sistema como\n" "tolos ficheros fueron sobroescritos por otros paquetes:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Inorar release destín non disponible '%s' pal paquete '%s'" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Tomando '%s' como paquetes d'oríxenes en llugar de '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Inorar versión non disponible de '%s' del paquete '%s'" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "La orde update nun lleva argumentos" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -719,15 +721,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información pue aidar a resolver la situación:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error internu, AutoRemover rompió coses" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -738,7 +740,7 @@ msgstr[1] "" "Los siguientes paquetes instaláronse de manera automática y ya nun se " "necesiten:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -747,22 +749,22 @@ msgstr[0] "El paquete %lu instalóse de mou automáticu y yá nun se necesita.\n msgstr[1] "" "Los paquetes %lu instaláronse de manera automática y ya nun se necesiten\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Usa 'apt-get autoremove' pa desinstalalos." msgstr[1] "Usa 'apt-get autoremove' pa desinstalalos." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error internu, AllUpgrade rompió coses" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Habríes d'executar 'apt-get -f install' para iguar estos:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -770,7 +772,7 @@ msgstr "" "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " "conseña una solución)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -782,78 +784,78 @@ msgstr "" "inestable, que dellos paquetes necesarios nun se crearon o que\n" "s'allugaron fuera d'Incoming." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Paquetes frañaos" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Instalaránse los siguientes paquetes extra:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Paquetes afalaos:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Paquetes encamentaos" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Nun pudo alcontrase'l paquete %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s axustáu como instaláu automáticamente.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Calculando l'anovamientu... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Falló" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Fecho" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Error internu, l'iguador de problemes frañó coses" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "Has de conseñar polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -862,7 +864,7 @@ msgstr "" "AVISU: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, fuzzy, c-format msgid "" "Please use:\n" @@ -874,87 +876,87 @@ msgstr "" "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal " "paquete.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru yá descargáu '%s'\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Falló la descarga de dellos archivos." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orde de desempaquetáu '%s'.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orde build '%s'.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Falló el procesu fíu" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que conseñar polo menos un paquete pa verificar les dependencies de " "construcción" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase información de dependencies de construcción pa %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construcción.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -963,7 +965,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -972,14 +974,14 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye " "enforma nuevu" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -988,7 +990,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versión " "disponible del paquete %s satisfaz los requisitos de versión" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -997,30 +999,30 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construcción de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construcción" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Coneutando a %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Módulos sofitaos:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1111,7 +1113,7 @@ msgstr "" "pa más información y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1713,7 +1715,7 @@ msgstr "" "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Nun se pue escribir en %s" @@ -2757,7 +2759,7 @@ msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2766,12 +2768,12 @@ msgstr "" "Nun pudó facese la configuración inmediatamente en '%s'. Por favor, mira man " "5 apt.conf embaxo APT::Immediate-Configure for details. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2806,7 +2808,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2951,21 +2953,21 @@ msgstr "Vaya, perpasaste'l númberu de dependencies coles que puede esti APT." msgid "Package %s %s was not found while processing file dependencies" msgstr "Al procesar dependencies de ficheros nun s'alcontró el paquete %s %s" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Lleendo llista de paquetes" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Recoyendo ficheros qu'apurren" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Fallu de E/S al grabar caché d'oríxenes" diff --git a/po/bg.po b/po/bg.po index 04583f19b..dfcebd630 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Таблица с версиите:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -486,7 +486,7 @@ msgstr "Преинсталацията на %s не е възможна, не м msgid "%s is already the newest version.\n" msgstr "%s вече е най-новата версия.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s е отбелязан като ръчно инсталиран.\n" @@ -598,8 +598,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" @@ -609,15 +609,17 @@ msgstr "Неуспех при определянето на свободното msgid "You don't have enough free space in %s." msgstr "Нямате достатъчно свободно пространство в %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Указано е „Trivial Only“, но това не е тривиална операция." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Да, прави каквото казвам!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -628,28 +630,28 @@ msgstr "" "За да продължите, въведете фразата „%s“\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Прекъсване." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -657,19 +659,19 @@ msgstr "" "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " "или да опитате с „--fix-missing“?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Неуспех при коригирането на липсващите пакети." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Прекъсване на инсталирането." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -683,35 +685,35 @@ msgstr[1] "" "Следните пакети са отстранени от системата поради препокриване на всичките " "им файлове от други пакети:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Това се прави автоматично от dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Игнориране на несъществуващо издание „%s“ на пакета „%s“" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Използване на пакет източник „%s“ вместо „%s“\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Игнориране на несъществуваща версия „%s“ на пакета „%s“" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -729,16 +731,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -748,7 +750,7 @@ msgstr[0] "Следният пакет е бил инсталиран автом msgstr[1] "" "Следните пакети са били инсталирани автоматично и вече не са необходими:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -757,21 +759,21 @@ msgstr[0] "%lu пакет е бил инсталиран автоматично msgstr[1] "" "%lu пакета са били инсталирани автоматично и вече не са необходими:\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете." msgstr[1] "Използвайте „apt-get autoremove“ за да ги премахнете." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -779,7 +781,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -791,33 +793,33 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Счупени пакети" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s е отбелязан като автоматично инсталиран.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -825,46 +827,46 @@ msgstr "" "Тази команда е остаряла. Вместо нея използвайте „apt-mark auto“ и „apt-mark " "manual“." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Изтегляне на %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -874,7 +876,7 @@ msgstr "" "адрес:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -886,70 +888,70 @@ msgstr "" "за да изтеглите последните промени в пакета (евентуално в процес на " "разработка).\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -958,18 +960,18 @@ msgstr "" "Липсва информация за архитектурата %s. Прегледайте информацията за APT::" "Architectures в apt.conf(5)." -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -978,7 +980,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява " "за пакети „%s“" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -987,14 +989,14 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1003,7 +1005,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията " "кандидат на пакета %s не може да удовлетвори изискването за версия" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1012,30 +1014,30 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "няма подходящи версии" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал на промените в %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1125,7 +1127,7 @@ msgstr "" "информация и опции.\n" " Това APT има Върховни Сили.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1748,7 +1750,7 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Неуспех при записа на %s" @@ -2802,7 +2804,7 @@ msgstr "Лошо форматиран ред %u в списъка с източ msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2811,12 +2813,12 @@ msgstr "" "Неуспех при незабавната настройка на „%s“. За повече информация вижте " "информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Неуспех при конфигуриране на „%s“. " -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2854,7 +2856,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3004,22 +3006,22 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Четене на списъците с пакети" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Събиране на информация за „Осигурява“" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" diff --git a/po/bs.po b/po/bs.po index f08c030b2..92371278a 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -154,7 +154,7 @@ msgid " Version table:" msgstr "" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -441,7 +441,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" @@ -549,8 +549,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -560,15 +560,17 @@ msgstr "" msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Da, uradi kako kažem!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -576,47 +578,47 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Odustani." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Odustajem od instalacije." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -626,35 +628,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -670,15 +672,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -688,7 +690,7 @@ msgid_plural "" msgstr[0] "Slijedeći NOVI paketi će biti instalirani:" msgstr[1] "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -696,27 +698,27 @@ msgid_plural "" msgstr[0] "Slijedeći NOVI paketi će biti instalirani:" msgstr[1] "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -724,85 +726,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -810,141 +812,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -990,7 +992,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1561,7 +1563,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@ -2535,19 +2537,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Ne mogu otvoriti %s" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2576,7 +2578,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2715,21 +2717,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Čitam spiskove paketa" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "" diff --git a/po/ca.po b/po/ca.po index 03d11e1aa..8eaa638a7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -108,7 +108,8 @@ msgstr "Heu de donar com a mínim un patró de cerca" #: cmdline/apt-cache.cc:1361 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." -msgstr "Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc." +msgstr "" +"Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc." #: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 #, c-format @@ -155,7 +156,7 @@ msgid " Version table:" msgstr " Taula de versió:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -450,7 +451,9 @@ msgstr "Els paquets virtuals com «%s» no es poden suprimir\n" #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà. Volíeu dir «%s»?\n" +msgstr "" +"El paquet «%s» no està instaŀlat, així doncs no es suprimirà. Volíeu dir " +"«%s»?\n" #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 #, c-format @@ -484,7 +487,7 @@ msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n" msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instaŀlat manualment.\n" @@ -596,8 +599,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@ -607,15 +610,17 @@ msgstr "No s'ha pogut determinar l'espai lliure en %s" msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -626,28 +631,28 @@ msgstr "" "Per continuar escriviu la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Avortat." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut baixar" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Baixada completa i en mode de només baixada" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -655,19 +660,19 @@ msgstr "" "No es poden baixar alguns arxius, proveu a executar apt-get update o " "intenteu-ho amb --fix-missing." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i els medi intercanviables actualment no estan suportats" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "S'està avortant la instaŀlació." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -681,37 +686,37 @@ msgstr[1] "" "Els següents paquets han desaparegut del vostre sistema ja\n" "que tots els fitxers s'han sobreescrit per altres paquets:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignora la versió objectiu «%s» no disponible del paquet «%s»" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Descarta la versió «%s» no disponible del paquet «%s»" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor " "automàtic" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -729,15 +734,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "La informació següent pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -748,7 +753,7 @@ msgstr[0] "" msgstr[1] "" "Els paquets següents s'han instaŀlat automàticament i ja no són necessaris:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -758,21 +763,21 @@ msgstr[0] "" msgstr[1] "" "Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Empreu «apt-get autoremove» per a suprimir-lo." msgstr[1] "Empreu «apt-get autoremove» per a suprimir-los." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -780,7 +785,7 @@ msgstr "" "Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -792,79 +797,81 @@ msgstr "" "«unstable» i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han introduït des d'«Incoming»." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "S'instaŀlaran els següents paquets extres:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "S'ha marcat %s com instaŀlat automàticament.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." -msgstr "Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» en el seu lloc." +msgstr "" +"Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» " +"en el seu lloc." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització… " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 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:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "No es troba una font per baixar la versió «%s» de «%s»" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "S'està baixant %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, 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:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -874,7 +881,7 @@ msgstr "" "versions «%s» a:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -883,149 +890,160 @@ msgid "" msgstr "" "Empreu:\n" "bzr branch %s\n" -"per obtenir les últimes actualitzacions (possiblement no publicades) del paquet.\n" +"per obtenir les últimes actualitzacions (possiblement no publicades) del " +"paquet.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Obtén el font %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" -msgstr "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) APT::Architectures per a configurar-ho" +msgstr "" +"No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) " +"APT::Architectures per a configurar-ho" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" -msgstr "La dependència %s en %s no es pot satisfer perquè %s no és permès als paquets «%s»" +msgstr "" +"La dependència %s en %s no es pot satisfer perquè %s no és permès als " +"paquets «%s»" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -msgstr "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet %s" +msgstr "" +"La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet " +"%s" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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 instaŀlat %s és " "massa nou" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" -msgstr "La dependència %s per a %s no es pot satisfer perquè la versió candidata del paquet %s no pot satisfer els requeriments de versions" +msgstr "" +"La dependència %s per a %s no es pot satisfer perquè la versió candidata del " +"paquet %s no pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" -msgstr "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió candidata" +msgstr "" +"La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió " +"candidata" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, 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:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Registre de canvis per a %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1117,7 +1135,7 @@ msgstr "" "per a obtenir més informació i opcions.\n" " Aquest APT té superpoders bovins.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1498,8 +1516,8 @@ msgstr "S'ha trobat almenys una signatura invàlida." #: methods/gpgv.cc:189 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -"No s'ha pogut executar el «gpgv» per a verificar la signatura (està instaŀlat " -"el gpgv?)" +"No s'ha pogut executar el «gpgv» per a verificar la signatura (està " +"instaŀlat el gpgv?)" #: methods/gpgv.cc:194 msgid "Unknown error executing gpgv" @@ -1722,7 +1740,7 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@ -2289,7 +2307,9 @@ msgstr "No s'ha pogut truncar el fitxer %s" msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " "Current value: %lu. (man 5 apt.conf)" -msgstr "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Start. Valor actual: %lu. (man 5 apt.conf)" +msgstr "" +"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-" +"Start. Valor actual: %lu. (man 5 apt.conf)" #: apt-pkg/contrib/mmap.cc:440 #, c-format @@ -2766,21 +2786,21 @@ msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -"No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 " -"apt.conf, sota APT::Immediate-Configure per a més detalls. (%d)" +"No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt." +"conf, sota APT::Immediate-Configure per a més detalls. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "No s'ha pogut configurar «%s»." -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2818,7 +2838,7 @@ msgstr "" "No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2905,7 +2925,9 @@ msgstr "No s'ha pogut llegir la llista de les fonts." msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" -msgstr "El valor «%s» és invàlid per a APT:Default-Release donat que aquest llançament no és disponible a les fonts" +msgstr "" +"El valor «%s» és invàlid per a APT:Default-Release donat que aquest " +"llançament no és disponible a les fonts" #: apt-pkg/policy.cc:399 #, c-format @@ -2968,21 +2990,21 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" @@ -3023,7 +3045,9 @@ msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." -msgstr "El fitxer Release per a %s ha caducat (invàlid des de %s). Les actualitzacions per a aquest dipòsit no s'aplicaran." +msgstr "" +"El fitxer Release per a %s ha caducat (invàlid des de %s). Les " +"actualitzacions per a aquest dipòsit no s'aplicaran." #: apt-pkg/acquire-item.cc:1488 #, c-format @@ -3573,8 +3597,8 @@ msgstr "No blocat" #~ "Please see man 5 apt.conf under APT::Immediate-Configure for details." #~ msgstr "" #~ "No s'ha pogut realitzar la configuració immediata de «%s» ja " -#~ "desempaquetat. Vegeu man 5 apt.conf, sota APT::Immediate-Configure " -#~ "per a més detalls." +#~ "desempaquetat. Vegeu man 5 apt.conf, sota APT::Immediate-Configure per a " +#~ "més detalls." #~ msgid "Error occurred while processing %s (NewPackage)" #~ msgstr "S'ha produït un error durant el processament de %s (NewPackage)" diff --git a/po/cs.po b/po/cs.po index 4ccb2f70b..9e37a046e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -153,7 +153,7 @@ msgid " Version table:" msgstr " Tabulka verzí:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -478,7 +478,7 @@ msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n" msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" @@ -586,8 +586,8 @@ msgstr "Po této operaci bude na disku použito dalších %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po této operaci bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nelze určit volné místo v %s" @@ -597,15 +597,17 @@ msgstr "Nelze určit volné místo v %s" msgid "You don't have enough free space in %s." msgstr "V %s nemáte dostatek volného místa." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -616,28 +618,28 @@ msgstr "" "Pro pokračování opište frázi „%s“\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Přerušeno." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -645,19 +647,19 @@ msgstr "" "Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --" "fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Nelze opravit chybějící balíky." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Přerušuji instalaci." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -674,35 +676,35 @@ msgstr[2] "" "Následující balíky z tohoto systému zmizely, protože\n" "všechny jejich soubory byly přepsány jinými balíky:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignoruje se nedostupné vydání „%s“ balíku „%s“" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vybírám „%s“ jako zdrojový balík místo „%s“\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignoruje se nedostupná verze „%s“ balíku „%s“" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -720,15 +722,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnitřní chyba, AutoRemover pokazil věci" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -740,7 +742,7 @@ msgstr[1] "" msgstr[2] "" "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -749,22 +751,22 @@ msgstr[0] "%lu balík byl nainstalován automaticky a již není potřeba.\n" msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n" msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Pro jeho odstranění použijte „apt-get autoremove“." msgstr[1] "Pro jejich odstranění použijte „apt-get autoremove“." msgstr[2] "Pro jejich odstranění použijte „apt-get autoremove“." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -772,7 +774,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -783,33 +785,33 @@ 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:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Nelze najít balík %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s nastaven jako instalovaný automaticky.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -817,46 +819,46 @@ msgstr "" "Tento příkaz je zastaralý, použijte místo něj „apt-mark auto“ a „apt-mark " "manual“." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci… " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Nelze zamknout adresář pro stahování" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Stahuje se %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Nelze najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -865,7 +867,7 @@ msgstr "" "INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -876,70 +878,70 @@ msgstr "" "použijte:\n" "bzr branch %s\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, 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:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Stažení zdroje %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -948,17 +950,17 @@ msgstr "" "O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte " "část APT::Architectures v manuálové stránce apt.conf(5)" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nelze získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -967,20 +969,20 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ " "dovolena" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -989,7 +991,7 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s " "nesplňuje požadavek na verzi" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -998,30 +1000,30 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou " "verzi" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění závislosti %s pro %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, 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:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Seznam změn %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1108,7 +1110,7 @@ msgstr "" "a apt.conf(5).\n" " Tato APT má schopnosti svaté krávy.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1719,7 +1721,7 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Nelze zapsat do %s" @@ -2754,7 +2756,7 @@ msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2763,12 +2765,12 @@ msgstr "" "Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man " "5 apt.conf v části APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Nelze nastavit „%s“." -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2802,7 +2804,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2946,21 +2948,21 @@ msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracov msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Čtu seznamy balíků" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" diff --git a/po/cy.po b/po/cy.po index 22bc9f403..d519064f4 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -172,7 +172,7 @@ msgid " Version table:" msgstr " Tabl Fersiynnau:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -511,7 +511,7 @@ msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" @@ -622,8 +622,8 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" @@ -633,15 +633,17 @@ msgstr "Does dim digon o le rhydd yn %s gennych" msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -652,29 +654,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -682,20 +684,20 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -705,35 +707,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -749,16 +751,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -768,7 +770,7 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -776,23 +778,23 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -801,7 +803,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -813,87 +815,87 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -901,86 +903,86 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, 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:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -989,7 +991,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -998,14 +1000,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1014,7 +1016,7 @@ 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:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1023,32 +1025,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1135,7 +1137,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1741,7 +1743,7 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" @@ -2804,20 +2806,20 @@ msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Methwyd agor ffeil %s" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2854,7 +2856,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3006,22 +3008,22 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" diff --git a/po/da.po b/po/da.po index 419f80cf9..fe982be16 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-07-03 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Versionstabel:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -488,7 +488,7 @@ msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" @@ -595,8 +595,8 @@ msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" @@ -606,15 +606,17 @@ msgstr "Kunne ikke bestemme ledig plads i %s" msgid "You don't have enough free space in %s." msgstr "Du har ikke nok ledig plads i %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Ja, gør som jeg siger!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -625,28 +627,28 @@ msgstr "" "For at fortsætte, skal du skrive '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Afbryder." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -654,19 +656,19 @@ msgstr "" "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' " "eller prøv med --fix-missing." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understøttes endnu ikke" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Afbryder installationen." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -680,37 +682,37 @@ msgstr[1] "" "De følgende pakker forsvandt fra dit system, da\n" "alle filer er blevet overskrevet af andre pakker:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorer utilgængelig måludgivelse '%s' af pakke '%s'" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vælger '%s' som kildepakke fremfor '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorer utilgængelig version '%s' af pakke '%s'" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte " "AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -728,15 +730,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern fejl. AutoRemover ødelagde noget" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -747,7 +749,7 @@ msgstr[0] "" msgstr[1] "" "Følgende pakker blev installeret automatisk, og behøves ikke længere:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -756,21 +758,21 @@ msgstr[0] "Pakken %lu blev installeret automatisk, og behøves ikke længere.\n" msgstr[1] "" "Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Brug »apt-get autoremove« til at fjerne den." msgstr[1] "Brug »apt-get autoremove« til at fjerne dem." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade ødelagde noget" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -778,7 +780,7 @@ msgstr "" "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv " "en løsning)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -789,33 +791,33 @@ 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:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Foreslåede pakker:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s sat til automatisk installation.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -823,46 +825,46 @@ msgstr "" "Denne kommando er forældet. Brug venligst »apt-mark auto« og »apt-mark " "manual« i stedet for." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Færdig" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemløseren ødelagde noget" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Henter %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -871,7 +873,7 @@ msgstr "" "BEMÆRK: Pakning af '%s' vedligeholdes i versionskontrolsystemet '%s' på:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -882,68 +884,68 @@ msgstr "" "bzr branch %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -952,17 +954,17 @@ msgstr "" "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::" "Architectures for opsætning" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -970,7 +972,7 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på '%s'" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -978,14 +980,14 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -994,7 +996,7 @@ msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige " "kandidater for pakken %s kan tilfredsstille versionskravene" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1003,30 +1005,30 @@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en " "kandidatversion" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Ændringslog for %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1114,7 +1116,7 @@ msgstr "" "for flere oplysninger og tilvalg.\n" " Denne APT har »Super Cow Powers«.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1736,7 +1738,7 @@ msgstr "" " -c=? Læs denne opsætningsfil\n" " -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@ -2774,7 +2776,7 @@ msgstr "Ugyldig linje %u i kildelisten %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2783,12 +2785,12 @@ msgstr "" "Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt." "conf under APT:Immediate-Cinfigure for detaljer. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Kunne ikke åbne filen »%s«. " -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2825,7 +2827,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2970,21 +2972,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Indlæser pakkelisterne" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Samler filudbud" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" diff --git a/po/de.po b/po/de.po index c6239b956..b78679a6b 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Versionstabelle:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -499,7 +499,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" @@ -608,8 +608,8 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden." @@ -619,15 +619,17 @@ msgstr "Freier Platz in %s konnte nicht bestimmt werden." msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Ja, tue was ich sage!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -638,28 +640,28 @@ msgstr "" "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Abbruch." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -667,19 +669,19 @@ msgstr "" "Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get " "update« ausführen oder mit »--fix-missing« probieren?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt." -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Fehlende Pakete konnten nicht korrigiert werden." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Installation abgebrochen." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -693,36 +695,36 @@ msgstr[1] "" "Die folgenden Pakete verschwanden von Ihrem System, da alle\n" "Dateien von anderen Paketen überschrieben wurden:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Nicht verfügbare Veröffentlichung »%s« von Paket »%s« wird ignoriert." -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Als Quellpaket wird »%s« statt »%s« gewählt.\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert." -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Der Befehl »update« akzeptiert keine Argumente." -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden." -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -741,16 +743,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interner Fehler, AutoRemover hat etwas beschädigt." -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -763,7 +765,7 @@ msgstr[1] "" "Die folgenden Pakete wurden automatisch installiert und werden nicht mehr " "benötigt:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -773,21 +775,21 @@ msgstr[0] "" msgstr[1] "" "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Verwenden Sie »apt-get autoremove«, um es zu entfernen." msgstr[1] "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt." -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -795,7 +797,7 @@ msgstr "" "Unerfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe " "eines Pakets (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -807,33 +809,33 @@ msgstr "" "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n" "nicht erstellt wurden oder Incoming noch nicht verlassen haben." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Beschädigte Pakete" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Paket %s konnte nicht gefunden werden" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s wurde als automatisch installiert festgelegt.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -841,50 +843,50 @@ msgstr "" "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark auto« " "und »apt-mark manual«." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Paketaktualisierung (Upgrade) wird berechnet... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt." -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden." -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " "herunterzuladen." -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Herunterladen von %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden." -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -894,7 +896,7 @@ msgstr "" "auf:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -906,70 +908,70 @@ msgstr "" "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n" "für das Paket abzurufen.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genügend freien Speicherplatz in %s." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Quelle %s wird heruntergeladen.\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten " "überprüft werden sollen." -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -978,18 +980,18 @@ msgstr "" "Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung " "finden Sie unter apt.conf(5) APT::Architectures." -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bauabhängigkeiten.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -998,7 +1000,7 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen " "nicht erlaubt ist." -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1007,14 +1009,14 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s " "ist zu neu." -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1024,7 +1026,7 @@ msgstr "" "Installationskandidaten für das Paket %s die Versionsanforderungen nicht " "erfüllen kann." -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1033,30 +1035,30 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein " "Installationskandidat existiert." -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Änderungsprotokoll (Changelog) für %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1151,7 +1153,7 @@ msgstr "" "bezüglich weitergehender Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-Kräfte.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1789,7 +1791,7 @@ msgstr "" " -c=? Diese Konfigurationsdatei lesen\n" " -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Schreiben nach %s nicht möglich" @@ -2849,7 +2851,7 @@ msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt." -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2858,12 +2860,12 @@ msgstr "" "»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt." "conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "»%s« konnte nicht konfiguriert werden. " -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2902,7 +2904,7 @@ msgstr "" "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte " "Pakete." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3061,21 +3063,21 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden." -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers" diff --git a/po/dz.po b/po/dz.po index 070dc18e1..c6eea92bd 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -494,7 +494,7 @@ msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འ msgid "%s is already the newest version.\n" msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" @@ -605,8 +605,8 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" @@ -616,15 +616,17 @@ msgstr "%s་ནང་བར་སྟོང་" msgid "You don't have enough free space in %s." msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -635,28 +637,28 @@ msgstr "" "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "བར་བཤོལ་འབད།" -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -664,19 +666,19 @@ msgstr "" "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་ apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-" "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -686,35 +688,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -730,16 +732,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -749,7 +751,7 @@ msgid_plural "" msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -757,21 +759,21 @@ msgid_plural "" msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -779,7 +781,7 @@ msgstr "" "མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།" "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -790,85 +792,85 @@ msgstr "" "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་" "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "འབད་ཚར་ཡི།" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -876,106 +878,106 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -984,37 +986,37 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1103,7 +1105,7 @@ msgstr "" "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n" " འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1699,7 +1701,7 @@ msgstr "" " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" "བཟུམ།\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr " %sལུ་འབྲི་མ་ཚུགས།" @@ -2741,19 +2743,19 @@ msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐི msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2790,7 +2792,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2934,21 +2936,21 @@ msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊ msgid "Package %s %s was not found while processing file dependencies" msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" diff --git a/po/el.po b/po/el.po index 338d1a51f..cadfdda02 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης \n" "Language-Team: Greek \n" @@ -165,7 +165,7 @@ msgid " Version table:" msgstr " Πίνακας Έκδοσης:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -501,7 +501,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" @@ -614,8 +614,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" @@ -625,15 +625,17 @@ msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερ msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -644,28 +646,28 @@ msgstr "" "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Εγκατάλειψη." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -673,20 +675,20 @@ msgstr "" "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update " "ή το --fix-missing;" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Αδύνατη η επίλυση των χαμένων πακέτων." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -696,36 +698,36 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Επιλογή του %s ώς λίστας πηγαίων πακέτων αντί της %s\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -743,15 +745,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -761,7 +763,7 @@ msgstr[0] "Το ακόλουθο πακέτο εγκαταστάθηκε αυτ msgstr[1] "" "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -771,21 +773,21 @@ msgstr[0] "" msgstr[1] "" "%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Χρησιμοποιήστε 'apt-get autoremove' για να το διαγράψετε." msgstr[1] "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -793,7 +795,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -805,89 +807,89 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "το %s έχει εγκατασταθεί αυτόματα\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -895,86 +897,86 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -983,7 +985,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο " "πακέτο %s" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -991,14 +993,14 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1007,7 +1009,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1016,30 +1018,30 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει " "υποψήφιαέκδοση" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog για %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1124,7 +1126,7 @@ msgstr "" "για περισσότερες πληροφορίες και επιλογές.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1722,7 +1724,7 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" @@ -2768,19 +2770,19 @@ msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγ msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2817,7 +2819,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2968,21 +2970,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Ανάγνωση Λιστών Πακέτων" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" diff --git a/po/es.po b/po/es.po index 9dc7d4f81..63e582ec6 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña \n" "Language-Team: Debian Spanish \n" @@ -210,7 +210,7 @@ msgid " Version table:" msgstr " Tabla de versión:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -545,7 +545,7 @@ msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" msgid "%s is already the newest version.\n" msgstr "%s ya está en su versión más reciente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" @@ -657,8 +657,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Se liberarán %sB después de esta operación.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" @@ -668,15 +668,17 @@ msgstr "No pude determinar el espacio libre en %s" msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especificó Trivial Only pero ésta no es una operación trivial." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Sí, ¡haga lo que le digo!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -687,28 +689,28 @@ msgstr "" "Para continuar escriba la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "No se pudieron descargar algunos archivos" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -716,19 +718,19 @@ msgstr "" "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar «apt-get " "update» o deba intentarlo de nuevo con --fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no están soportados --fix-missing e intercambio de medio" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Abortando la instalación." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -742,36 +744,36 @@ msgstr[1] "" "Los paquetes mostrados a continuación han desaparecido de su sistema\n" "dado que todos sus ficheros han sido sobreescritos por otros paquetes:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Dpkg realiza esto de forma automática y a propósito." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorar la distribución objetivo no disponible «%s» del paquete «%s»" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Escogiendo «%s» como paquete fuente en lugar de «%s»\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorar la versión no disponible «%s» del paquete «%s»" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "El comando de actualización no toma argumentos" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Se supone que no vamos a eliminar cosas, no se pudo iniciar «AutoRemover»" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -789,15 +791,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información puede ayudar a resolver la situación:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error interno, «AutoRemover» rompió cosas" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -810,7 +812,7 @@ msgstr[1] "" "Los paquetes indicados a continuación se instalaron de forma automática y ya " "no son necesarios." -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -819,22 +821,22 @@ msgstr[0] "Se instaló de forma automática %lu paquete y ya no es necesario.\n" msgstr[1] "" "Se instalaron de forma automática %lu paquetes y ya no son necesarios.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Utilice «apt-get autoremove» para eliminarlos." msgstr[1] "Utilice «apt-get autoremove» para eliminarlos." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompió cosas" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -842,7 +844,7 @@ msgstr "" "Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o " "especifique una solución)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -854,79 +856,79 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "fijado %s como instalado automáticamente.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Falló" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solución de problemas rompió algunas cosas" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, 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:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -936,7 +938,7 @@ msgstr "" "versiones «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, fuzzy, c-format msgid "" "Please use:\n" @@ -948,87 +950,87 @@ msgstr "" "para obtener las últimas actualizaciones (posiblemente no publicadas aún) " "del paquete.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omitiendo el fichero ya descargado «%s»\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento «%s».\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción «%s».\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus dependencias de " "construcción" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1037,7 +1039,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1046,14 +1048,14 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1062,7 +1064,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versión " "disponible del paquete %s satisface los requisitos de versión" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1071,30 +1073,30 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, 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:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectando a %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1185,7 +1187,7 @@ msgstr "" "para más información y opciones.\n" " Este APT tiene poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1789,7 +1791,7 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::" "cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" @@ -2845,7 +2847,7 @@ msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2855,12 +2857,12 @@ msgstr "" "de manual con «man 5 apt.conf» bajo «APT::Immediate-Configure» para más " "información. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "No pude abrir el fichero «%s»" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2898,7 +2900,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes rotos." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3048,21 +3050,21 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Al procesar las dependencias de archivos no se encontró el paquete %s %s" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Leyendo lista de paquetes" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Error de E/S guardando caché fuente" diff --git a/po/eu.po b/po/eu.po index 317fc4711..1bec8b578 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Bertsio taula:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -486,7 +486,7 @@ msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" @@ -595,8 +595,8 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." @@ -606,15 +606,17 @@ msgstr "Ezin da %s(e)n duzun leku librea atzeman." msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -625,28 +627,28 @@ msgstr "" "Jarraitzeko, idatzi '%s' esaldia\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Abortatu." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -654,19 +656,19 @@ msgstr "" "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Abortatu instalazioa." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -676,35 +678,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -722,15 +724,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -744,7 +746,7 @@ msgstr[1] "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -756,22 +758,22 @@ msgstr[1] "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "'apt-get autoremove' erabili ezabatzeko." msgstr[1] "'apt-get autoremove' erabili ezabatzeko." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -779,7 +781,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -791,85 +793,85 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -877,87 +879,87 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -965,7 +967,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -973,14 +975,14 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -989,7 +991,7 @@ 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:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -997,30 +999,30 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, 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:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1107,7 +1109,7 @@ msgstr "" "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" " APT honek Super Behiaren Ahalmenak ditu.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1703,7 +1705,7 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" @@ -2742,19 +2744,19 @@ msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2790,7 +2792,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2932,21 +2934,21 @@ msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu." msgid "Package %s %s was not found while processing file dependencies" msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Pakete Zerrenda irakurtzen" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Fitxategiaren erreferentziak biltzen" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "S/I errorea iturburu katxea gordetzean" diff --git a/po/fi.po b/po/fi.po index 0fb9320a7..849bfc2f6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr " Versiotaulukko:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -483,7 +483,7 @@ msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" @@ -591,8 +591,8 @@ msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" @@ -602,16 +602,18 @@ msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -622,28 +624,28 @@ msgstr "" "Jatka kirjoittamalla \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Keskeytä." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -651,19 +653,19 @@ msgstr "" "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai " "kokeile --fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Asennus keskeytetään." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -673,36 +675,36 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "stat ei toiminut lähdepakettiluettelolle %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -720,15 +722,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Sisäinen virhe, AutoRemover rikkoi jotain" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -742,7 +744,7 @@ msgstr[1] "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -754,22 +756,22 @@ msgstr[1] "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Poista ne komennolla \"apt-get autoremove\"." msgstr[1] "Poista ne komennolla \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -777,7 +779,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -788,85 +790,85 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -874,86 +876,86 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -961,7 +963,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -969,14 +971,14 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -985,7 +987,7 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -993,30 +995,30 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1102,7 +1104,7 @@ msgstr "" "lisätietoja ja lisää valitsimia.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1696,7 +1698,7 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" @@ -2734,19 +2736,19 @@ msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2780,7 +2782,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2924,21 +2926,21 @@ msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitell msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Luetaan pakettiluetteloita" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" diff --git a/po/fr.po b/po/fr.po index 8277aae65..8407d3231 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-06-27 11:17+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-06-25 19:58+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -92,77 +92,77 @@ msgstr "Espace disque gaspillé : " msgid "Total space accounted for: " msgstr "Total de l'espace attribué : " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 #, c-format msgid "Package file %s is out of sync." msgstr "Fichier %s désynchronisé." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378 -#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 +#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Aucun paquet n'a été trouvé" -#: cmdline/apt-cache.cc:1222 +#: cmdline/apt-cache.cc:1226 msgid "You must give at least one search pattern" msgstr "Vous devez fournir au moins un motif de recherche" -#: cmdline/apt-cache.cc:1357 +#: cmdline/apt-cache.cc:1361 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »." -#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508 +#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1486 msgid "Package files:" msgstr "Fichiers du paquet :" -#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580 +#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Le cache est désynchronisé, impossible de référencer un fichier" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1503 +#: cmdline/apt-cache.cc:1507 msgid "Pinned packages:" msgstr "Paquets épinglés :" -#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560 +#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 msgid "(not found)" msgstr "(non trouvé)" -#: cmdline/apt-cache.cc:1523 +#: cmdline/apt-cache.cc:1527 msgid " Installed: " msgstr " Installé : " -#: cmdline/apt-cache.cc:1524 +#: cmdline/apt-cache.cc:1528 msgid " Candidate: " msgstr " Candidat : " -#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550 +#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 msgid "(none)" msgstr "(aucun)" -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1561 msgid " Package pin: " msgstr " Épinglage de paquet : " #. Show the priority tables -#: cmdline/apt-cache.cc:1566 +#: cmdline/apt-cache.cc:1570 msgid " Version table:" msgstr " Table de version :" -#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363 +#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pour %s compilé sur %s %s\n" -#: cmdline/apt-cache.cc:1686 +#: cmdline/apt-cache.cc:1690 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -493,7 +493,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s est déjà la plus récente version disponible.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" @@ -604,8 +604,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Après cette opération, %so d'espace disque seront libérés.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" @@ -615,7 +615,7 @@ msgstr "Impossible de déterminer l'espace disponible sur %s" msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération " @@ -623,11 +623,13 @@ msgstr "" # The space before the exclamation mark must not be a non-breaking space; this # sentence is supposed to be typed by a user who cannot see the difference. -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Oui, faites ce que je vous dis !" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -638,28 +640,28 @@ msgstr "" "Pour continuer, tapez la phrase « %s »\n" " ?]" -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Annulation." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -667,20 +669,20 @@ msgstr "" "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-" "get update ou essayer avec --fix-missing ?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 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." -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Annulation de l'installation." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -694,39 +696,39 @@ msgstr[1] "" "Les paquets suivants ont disparu du système car tous leurs fichiers\n" "ont été remplacés par d'autres paquets :" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" "Note : cette opération volontaire (effectuée par dpkg) est automatique." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" "La distribution cible « %s » indisponible pour le paquet « %s » est ignorée" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Choix de « %s » comme paquet source à la place de « %s »\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "La version « %s » indisponible du paquet « %s » est ignorée" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas de paramètre" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Aucune suppression n'est censée se produire : impossible de lancer " "« Autoremover »" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -745,16 +747,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 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:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Erreur interne, l'outil de suppression automatique a cassé quelque chose." -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -766,7 +768,7 @@ msgstr[1] "" "Les paquets suivants ont été installés automatiquement et ne sont plus " "nécessaires :" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -776,22 +778,22 @@ msgstr[0] "" msgstr[1] "" "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer." msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -799,7 +801,7 @@ msgstr "" "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -811,33 +813,33 @@ 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:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Paquets défectueux" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Paquets suggérés :" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Paquets recommandés :" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s passé en « installé automatiquement ».\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -845,50 +847,50 @@ msgstr "" "Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-" "mark manual »." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Échec" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 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:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossible de trouver une source de téléchargement de la version « %s » de " "« %s »" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Téléchargement de %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, 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:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -898,7 +900,7 @@ msgstr "" "suivi de versions « %s » à l'adresse :\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -910,70 +912,70 @@ msgstr "" "pour récupérer les dernières mises à jour (éventuellement non encore " "publiées) du paquet.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, 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:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, 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:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -983,17 +985,17 @@ msgstr "" "consulter la section à propos de APT::Architectures dans la page de manuel " "apt.conf(5)." -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:2997 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1002,7 +1004,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas " "autorisé avec les paquets « %s »." -#: cmdline/apt-get.cc:3015 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1011,14 +1013,14 @@ 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:3038 +#: cmdline/apt-get.cc:3051 #, 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:3077 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1027,7 +1029,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "disponible du paquet %s ne peut satisfaire les prérequis de version." -#: cmdline/apt-get.cc:3083 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1036,31 +1038,31 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s " "n'a pas de version disponible." -#: cmdline/apt-get.cc:3106 +#: cmdline/apt-get.cc:3119 #, 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:3122 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:3127 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Journal des modifications pour %s (%s)" -#: cmdline/apt-get.cc:3355 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:3396 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1150,7 +1152,7 @@ msgstr "" "apt.conf(5) pour plus d'informations et d'options.\n" " Cet APT a les « Super Cow Powers »\n" -#: cmdline/apt-get.cc:3561 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1226,29 +1228,29 @@ msgstr "%s était déjà marqué comme figé (« hold »).\n" msgid "%s was already not hold.\n" msgstr "%s était déjà marqué comme non figé.\n" -#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314 +#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002 #, c-format msgid "Waited for %s but it wasn't there" msgstr "A attendu %s mais il n'était pas présent" -#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:297 +#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309 #, c-format msgid "%s set on hold.\n" msgstr "%s passé en figé (« hold »).\n" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:302 +#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314 #, c-format msgid "Canceled hold on %s.\n" msgstr "Annulation de l'état figé pour %s.\n" -#: cmdline/apt-mark.cc:320 +#: cmdline/apt-mark.cc:332 msgid "Executing dpkg failed. Are you root?" msgstr "" "Échec de l'exécution de dpkg. Possédez-vous les privilèges du " "superutilisateur ?" -#: cmdline/apt-mark.cc:367 +#: cmdline/apt-mark.cc:379 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -1659,7 +1661,7 @@ msgstr "Erreur interne" #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 -#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359 +#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" @@ -1667,7 +1669,7 @@ msgstr "Impossible de lire %s" #: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 #: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:122 +#: apt-pkg/clean.cc:123 #, c-format msgid "Unable to change to %s" msgstr "Impossible d'accéder à %s" @@ -1785,7 +1787,7 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1277 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Impossible d'écrire sur %s" @@ -2329,34 +2331,34 @@ msgstr "Fichier de contrôle non traitable" msgid "Can't mmap an empty file" msgstr "Impossible de mapper un fichier vide en mémoire" -#: apt-pkg/contrib/mmap.cc:110 +#: apt-pkg/contrib/mmap.cc:111 #, c-format msgid "Couldn't duplicate file descriptor %i" msgstr "Impossible de dupliquer le descripteur de fichier %i" -#: apt-pkg/contrib/mmap.cc:118 +#: apt-pkg/contrib/mmap.cc:119 #, c-format msgid "Couldn't make mmap of %llu bytes" msgstr "Impossible de réaliser un mapping de %llu octets en mémoire" -#: apt-pkg/contrib/mmap.cc:145 +#: apt-pkg/contrib/mmap.cc:146 msgid "Unable to close mmap" msgstr "Impossible de fermer la « mmap »" -#: apt-pkg/contrib/mmap.cc:173 apt-pkg/contrib/mmap.cc:201 +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 msgid "Unable to synchronize mmap" msgstr "Impossible de synchroniser la « mmap »" -#: apt-pkg/contrib/mmap.cc:279 +#: apt-pkg/contrib/mmap.cc:290 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Impossible de réaliser un mapping de %lu octets en mémoire" -#: apt-pkg/contrib/mmap.cc:311 +#: apt-pkg/contrib/mmap.cc:322 msgid "Failed to truncate file" msgstr "Échec de la troncature du fichier" -#: apt-pkg/contrib/mmap.cc:330 +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " @@ -2366,7 +2368,7 @@ msgstr "" "Vous devriez augmenter la taille de APT::Cache-Start, dont la valeur " "actuelle est de %lu (voir « man 5 apt.conf »)." -#: apt-pkg/contrib/mmap.cc:429 +#: apt-pkg/contrib/mmap.cc:440 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2375,7 +2377,7 @@ msgstr "" "Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets " "est déjà atteinte." -#: apt-pkg/contrib/mmap.cc:432 +#: apt-pkg/contrib/mmap.cc:443 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2609,7 +2611,7 @@ msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" msgid "Sub-process %s exited unexpectedly" msgstr "Le sous-processus %s s'est arrêté prématurément" -#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:655 +#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661 #, c-format msgid "Could not open file %s" msgstr "Impossible d'ouvrir le fichier %s" @@ -2652,7 +2654,7 @@ msgstr "Problème de renommage du fichier %s en %s" msgid "Problem unlinking the file %s" msgstr "Problème de suppression du lien %s" -#: apt-pkg/contrib/fileutl.cc:1755 +#: apt-pkg/contrib/fileutl.cc:1754 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" @@ -2838,7 +2840,7 @@ msgstr "" msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:469 +#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." @@ -2854,7 +2856,7 @@ msgid "Type '%s' is not known on line %u in source list %s" msgstr "" "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:891 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2864,12 +2866,12 @@ msgstr "" "consulter la page de manuel apt.conf(5) et notamment la section à propos de " "APT::Immediate-Configure, pour plus d'informations. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Impossible de configurer « %s »." -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2886,7 +2888,7 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "Le type de fichier d'index « %s » n'est pas accepté" -#: apt-pkg/algorithms.cc:261 +#: apt-pkg/algorithms.cc:266 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2894,7 +2896,7 @@ msgstr "" "Le paquet %s doit être réinstallé, mais il est impossible de trouver son " "archive." -#: apt-pkg/algorithms.cc:1223 +#: apt-pkg/algorithms.cc:1228 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2902,13 +2904,13 @@ msgstr "" "Erreur, pkgProblem::Resolve a généré des ruptures, ce qui a pu être causé " "par les paquets devant être gardés en l'état." -#: apt-pkg/algorithms.cc:1225 +#: apt-pkg/algorithms.cc:1230 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." -#: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2993,7 +2995,7 @@ msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes." msgid "The list of sources could not be read." msgstr "La liste des sources ne peut être lue." -#: apt-pkg/policy.cc:74 +#: apt-pkg/policy.cc:75 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -3002,86 +3004,87 @@ msgstr "" "La valeur « %s » n'est pas valable pour APT::Default-Release car cette " "version ne fait pas partie des sources disponibles." -#: apt-pkg/policy.cc:396 +#: apt-pkg/policy.cc:399 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Enregistrement non valable dans le fichier de préférences %s, aucune entrée " "« Package »." -#: apt-pkg/policy.cc:418 +#: apt-pkg/policy.cc:421 #, c-format msgid "Did not understand pin type %s" msgstr "Type d'épinglage %s inconnu" -#: apt-pkg/policy.cc:426 +#: apt-pkg/policy.cc:429 msgid "No priority (or zero) specified for pin" msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage" -#: apt-pkg/pkgcachegen.cc:85 +#: apt-pkg/pkgcachegen.cc:87 msgid "Cache has an incompatible versioning system" msgstr "Le cache possède un système de version incompatible" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277 -#: apt-pkg/pkgcachegen.cc:308 apt-pkg/pkgcachegen.cc:316 -#: apt-pkg/pkgcachegen.cc:358 apt-pkg/pkgcachegen.cc:362 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:389 -#: apt-pkg/pkgcachegen.cc:393 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423 -#: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471 -#: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516 +#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 +#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 +#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 +#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 +#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 +#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Erreur apparue lors du traitement de %s (%s%d)" -#: apt-pkg/pkgcachegen.cc:234 +#: 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 traiter." -#: apt-pkg/pkgcachegen.cc:237 +#: 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." -#: apt-pkg/pkgcachegen.cc:240 +#: apt-pkg/pkgcachegen.cc:257 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." -#: apt-pkg/pkgcachegen.cc:243 +#: 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 traiter." -#: apt-pkg/pkgcachegen.cc:523 +#: apt-pkg/pkgcachegen.cc:577 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des " "fichiers" -#: apt-pkg/pkgcachegen.cc:1088 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossible de localiser la liste des paquets sources %s" -#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280 -#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Lecture des listes de paquets" -#: apt-pkg/pkgcachegen.cc:1193 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Assemblage des fichiers listés dans les champs Provides" -#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "" "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" @@ -3210,7 +3213,7 @@ msgstr "Entrée « Date » non valable dans le fichier Release %s" msgid "Vendor block %s contains no fingerprint" msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" -#: apt-pkg/cdrom.cc:550 +#: apt-pkg/cdrom.cc:576 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -3219,41 +3222,41 @@ msgstr "" "Utilisation du point de montage %s pour le cédérom\n" "Montage du cédérom\n" -#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:656 +#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 msgid "Identifying.. " msgstr "Identification..." -#: apt-pkg/cdrom.cc:587 +#: apt-pkg/cdrom.cc:613 #, c-format msgid "Stored label: %s\n" msgstr "Étiquette stockée : %s\n" -#: apt-pkg/cdrom.cc:596 apt-pkg/cdrom.cc:879 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 msgid "Unmounting CD-ROM...\n" msgstr "Démontage du cédérom...\n" -#: apt-pkg/cdrom.cc:616 +#: apt-pkg/cdrom.cc:642 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilisation du point de montage %s pour le cédérom\n" -#: apt-pkg/cdrom.cc:634 +#: apt-pkg/cdrom.cc:660 msgid "Unmounting CD-ROM\n" msgstr "Démontage du cédérom\n" -#: apt-pkg/cdrom.cc:639 +#: apt-pkg/cdrom.cc:665 msgid "Waiting for disc...\n" msgstr "Attente du disque...\n" -#: apt-pkg/cdrom.cc:648 +#: apt-pkg/cdrom.cc:674 msgid "Mounting CD-ROM...\n" msgstr "Montage du cédérom...\n" -#: apt-pkg/cdrom.cc:667 +#: apt-pkg/cdrom.cc:693 msgid "Scanning disc for index files..\n" msgstr "Examen du disque à la recherche de fichiers d'index...\n" -#: apt-pkg/cdrom.cc:716 +#: apt-pkg/cdrom.cc:744 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3262,7 +3265,7 @@ msgstr "" "%zu index de paquets trouvés, %zu index de sources, %zu index de traductions " "et %zu signatures\n" -#: apt-pkg/cdrom.cc:727 +#: apt-pkg/cdrom.cc:755 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3270,16 +3273,16 @@ msgstr "" "Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian " "ou bien l'architecture est-elle incorrecte." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:782 #, c-format msgid "Found label '%s'\n" msgstr "Étiquette « %s » trouvée\n" -#: apt-pkg/cdrom.cc:783 +#: apt-pkg/cdrom.cc:811 msgid "That is not a valid name, try again.\n" msgstr "Ce nom n'est pas valable, veuillez recommencer.\n" -#: apt-pkg/cdrom.cc:800 +#: apt-pkg/cdrom.cc:828 #, c-format msgid "" "This disc is called: \n" @@ -3288,96 +3291,91 @@ msgstr "" "Ce disque s'appelle :\n" "« %s »\n" -#: apt-pkg/cdrom.cc:802 +#: apt-pkg/cdrom.cc:830 msgid "Copying package lists..." msgstr "Copie des listes de paquets..." -#: apt-pkg/cdrom.cc:829 +#: apt-pkg/cdrom.cc:857 msgid "Writing new source list\n" msgstr "Écriture de la nouvelle liste de sources\n" -#: apt-pkg/cdrom.cc:837 +#: apt-pkg/cdrom.cc:865 msgid "Source list entries for this disc are:\n" msgstr "Les entrées de listes de sources pour ce disque sont :\n" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884 #, c-format msgid "Wrote %i records.\n" msgstr "%i enregistrements écrits.\n" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i enregistrements écrits avec %i fichiers manquants.\n" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "%i enregistrements écrits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" -#: apt-pkg/indexcopy.cc:503 -#, c-format -msgid "Skipping nonexistent file %s" -msgstr "Fichier %s inexistant ignoré" - -#: apt-pkg/indexcopy.cc:509 +#: apt-pkg/indexcopy.cc:515 #, c-format msgid "Can't find authentication record for: %s" msgstr "Impossible de trouver l'enregistrement d'authentification pour %s" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/indexcopy.cc:521 #, c-format msgid "Hash mismatch for: %s" msgstr "Somme de contrôle de hachage incohérente pour %s" -#: apt-pkg/indexcopy.cc:659 +#: apt-pkg/indexcopy.cc:665 #, c-format msgid "File %s doesn't start with a clearsigned message" msgstr "Le fichier %s ne commence pas par un message signé en clair." #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/indexcopy.cc:690 +#: apt-pkg/indexcopy.cc:696 #, c-format msgid "No keyring installed in %s." msgstr "Pas de porte-clés installé dans %s." -#: apt-pkg/cacheset.cc:401 +#: apt-pkg/cacheset.cc:403 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version « %s » de « %s » est introuvable" -#: apt-pkg/cacheset.cc:404 +#: apt-pkg/cacheset.cc:406 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version « %s » de « %s » n'a pu être trouvée" -#: apt-pkg/cacheset.cc:515 +#: apt-pkg/cacheset.cc:517 #, c-format msgid "Couldn't find task '%s'" msgstr "Impossible de trouver la tâche « %s »" -#: apt-pkg/cacheset.cc:521 +#: apt-pkg/cacheset.cc:523 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" "Impossible de trouver de paquet correspondant à l'expression rationnelle " "« %s »" -#: apt-pkg/cacheset.cc:532 +#: apt-pkg/cacheset.cc:534 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" "Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet " "virtuel" -#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546 +#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " @@ -3386,20 +3384,20 @@ msgstr "" "Impossible de choisir une version installée ou candidate du paquet « %s » " "qui n'en n'a aucune" -#: apt-pkg/cacheset.cc:553 +#: apt-pkg/cacheset.cc:555 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" "Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un " "paquet virtuel" -#: apt-pkg/cacheset.cc:561 +#: apt-pkg/cacheset.cc:563 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" "Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas" -#: apt-pkg/cacheset.cc:569 +#: apt-pkg/cacheset.cc:571 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3414,15 +3412,15 @@ msgstr "Envoi du scénario au solveur" msgid "Send request to solver" msgstr "Envoi d'une requête au solveur" -#: apt-pkg/edsp.cc:277 +#: apt-pkg/edsp.cc:279 msgid "Prepare for receiving solution" msgstr "Préparation à la réception de la solution" -#: apt-pkg/edsp.cc:284 +#: apt-pkg/edsp.cc:286 msgid "External solver failed without a proper error message" msgstr "Échec du solveur externe sans message d'erreur adapté" -#: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 +#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 msgid "Execute external solver" msgstr "Exécu tion du solveur externe" @@ -3507,30 +3505,30 @@ msgstr "Préparation de la suppression complète de %s" msgid "Completely removed %s" msgstr "%s complètement supprimé" -#: apt-pkg/deb/dpkgpm.cc:1209 +#: apt-pkg/deb/dpkgpm.cc:1213 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Impossible d'écrire le journal, échec d'openpty()\n" "(/dev/pts est-il monté ?)\n" -#: apt-pkg/deb/dpkgpm.cc:1239 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Running dpkg" msgstr "Exécution de dpkg" -#: apt-pkg/deb/dpkgpm.cc:1411 +#: apt-pkg/deb/dpkgpm.cc:1415 msgid "Operation was interrupted before it could finish" msgstr "L'opération a été interrompue avant de se terminer" -#: apt-pkg/deb/dpkgpm.cc:1473 +#: apt-pkg/deb/dpkgpm.cc:1477 msgid "No apport report written because MaxReports is reached already" msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1478 +#: apt-pkg/deb/dpkgpm.cc:1482 msgid "dependency problems - leaving unconfigured" msgstr "problème de dépendances : laissé non configuré" -#: apt-pkg/deb/dpkgpm.cc:1480 +#: apt-pkg/deb/dpkgpm.cc:1484 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3538,14 +3536,14 @@ msgstr "" "Aucun rapport « apport » n'a été créé car le message d'erreur indique une " "erreur consécutive à un échec précédent." -#: apt-pkg/deb/dpkgpm.cc:1486 +#: apt-pkg/deb/dpkgpm.cc:1490 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" "Aucun rapport « apport » n'a été créé car un disque plein a été signalé" -#: apt-pkg/deb/dpkgpm.cc:1492 +#: apt-pkg/deb/dpkgpm.cc:1496 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3553,7 +3551,7 @@ msgstr "" "Aucun « apport » n'a été créé car une erreur de dépassement de capacité " "mémoire a été signalée" -#: apt-pkg/deb/dpkgpm.cc:1499 +#: apt-pkg/deb/dpkgpm.cc:1503 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3590,6 +3588,9 @@ msgstr "" msgid "Not locked" msgstr "Non verrouillé" +#~ msgid "Skipping nonexistent file %s" +#~ msgstr "Fichier %s inexistant ignoré" + #~ msgid "Failed to remove %s" #~ msgstr "Impossible de supprimer %s" diff --git a/po/gl.po b/po/gl.po index fe80c041c..15d867bc7 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Táboa de versións:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -488,7 +488,7 @@ msgstr "A reinstalación de %s non é posíbel, non se pode descargar.\n" msgid "%s is already the newest version.\n" msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s cambiado a instalado manualmente.\n" @@ -599,8 +599,8 @@ msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non foi posíbel determinar o espazo libre en %s" @@ -610,15 +610,17 @@ msgstr "Non foi posíbel determinar o espazo libre en %s" msgid "You don't have enough free space in %s." msgstr "Non hai espazo libre abondo en %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Especificouse «Só triviais» mais esta non é unha operación trivial." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Si, fai o que digo!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -629,28 +631,28 @@ msgstr "" "Para continuar escriba a frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Interromper." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Quere continuar [S/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Non foi posíbel descargar algúns ficheiros" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -658,20 +660,20 @@ msgstr "" "Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-" "missing." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "O emprego conxunto de --fix-missing e intercambio de discos non está admitido" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Interrompendo a instalación." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -685,37 +687,37 @@ msgstr[1] "" "Os seguintes paquetes desapareceron do seu sistema e todos os \n" "ficheiros serán sobrescritos por outros paquetes:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Isto será feito automaticamente por dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorase a versión de destino «%s» non dispoñíbel do paquete «%s»" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Tome «%s» como paquete fonte no canto de «%s»\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorar a versión non dispoñíbel «%s» do paquete «%s»" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "A orde «update» non toma argumentos" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Non se agarda que eliminemos cousas, non se pode iniciar o Retirado " "automático" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -733,15 +735,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a solucionar a situación:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Produciuse un erro interno, o Retirado automático estragou cousas" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -753,7 +755,7 @@ msgstr[1] "" "Os seguintes paquetes foron instalados automaticamente e xa non son " "necesarios:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -762,22 +764,22 @@ msgstr[0] "%lu paquete foi instalado automaticamente e xa non é necesario.\n" msgstr[1] "" "%lu paquetes foron instalados automaticamente e xa non son necesarios.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Empregue «apt-get autoremove» para eliminalos." msgstr[1] "Empregue «apt-get autoremove» para eliminalos." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Produciuse un erro interno, AllUpgrade estragou cousas" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Pode querer executar «apt-get -f install» para corrixir isto:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -785,7 +787,7 @@ msgstr "" "Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou " "especifique unha solución)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -798,78 +800,78 @@ msgstr "" "algúns paquetes solicitados aínda non se creasen ou que se movesen da " "entrada." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Paquetes estragados" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Instalaranse os seguintes paquetes extra:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Paquetes suxeridos:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Non foi posíbel atopar o paquete %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s está estabelecido para a súa instalación automática.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Calculando a anovación... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Feito" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Produciuse un erro interno, o solucionador interno estragou cousas" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Non é posíbel bloquear o directorio de descargas" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Descargando %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "Ten que especificar polo menos un paquete para obter o código fonte" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Non sé posíbel atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -878,7 +880,7 @@ msgstr "" "AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, fuzzy, c-format msgid "" "Please use:\n" @@ -890,87 +892,87 @@ msgstr "" "para obter as últimas actualizacións (posibelmente non publicadas) do " "paquete.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado «%s»\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre abondo en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ten que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Non se puideron obter algúns arquivos." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetado «%s».\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a orde de construción de «%s».\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar polo menos un paquete para comprobarlle as dependencias " "de compilación" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non é posíbel obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -979,7 +981,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -988,14 +990,14 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s " "é novo de máis" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1004,7 +1006,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque ningunha versión " "dispoñíbel do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1013,30 +1015,30 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de construción de %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Non se puideron procesar as dependencias de construción" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Rexistro de cambios de %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Módulos admitidos:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1129,7 +1131,7 @@ msgstr "" "para obter mais información e opcións\n" " Este APT ten poderes da Super Vaca.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1735,7 +1737,7 @@ msgstr "" " -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Non é posíbel escribir en %s" @@ -2789,7 +2791,7 @@ msgstr "Liña %u mal construída na lista de orixes %s (tipo)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2798,12 +2800,12 @@ msgstr "" "Non foi posíbel facer a configuración inmediata en «%s». Vexa man 5 apt.conf " "baixo APT::Immediate-Configure para obter máis detalles. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Non foi posíbel abrir o ficheiro «%s»" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2839,7 +2841,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2988,21 +2990,21 @@ msgstr "" "Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de " "ficheiros" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Non foi posíbel atopar a lista de paquetes fonte %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Lendo as listas de paquetes" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Recollendo as provisións de ficheiros" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Produciuse un erro de E/S ao gravar a caché de fontes" diff --git a/po/hu.po b/po/hu.po index 1cc329864..d526ceb40 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Verziótáblázat:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -481,7 +481,7 @@ msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s kézi telepítésűre állítva.\n" @@ -588,8 +588,8 @@ msgstr "A művelet után %sB lemezterület kerül felhasználásra.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "A művelet után %sB lemezterület szabadul fel.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely mennyisége itt: %s" @@ -599,15 +599,17 @@ msgstr "Nem határozható meg a szabad hely mennyisége itt: %s" msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A „Trivial Only” meg van adva, de ez nem egy triviális művelet." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -618,28 +620,28 @@ msgstr "" "A folytatáshoz írja be ezt a mondatot: „%s”\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Megszakítva." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarja [I/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a „csak letöltés” módban" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -647,19 +649,19 @@ msgstr "" "Nem lehet letölteni néhány archívumot. Próbálja futtatni az „apt-get update” " "parancsot, vagy használja a --fix-missing kapcsolót." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "A --fix-missing és az adathordozó-csere jelenleg nem támogatott" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Telepítés megszakítása." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -673,38 +675,38 @@ msgstr[1] "" "A következő csomagok eltűntek a rendszerből, mivel\n" "az összes fájlt más csomagok fölülírták:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" "A(z) „%2$s” csomag el nem érhető „%1$s” cél kiadásának figyelmen kívül " "hagyása" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "„%s” kiválasztása forráscsomagként „%s” helyett\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" "A(z) „%2$s” csomag el nem érhető „%1$s” verziójának figyelmen kívül hagyása" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nem kellene semmit törölni, az AutoRemover nem indítható" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -722,15 +724,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információk segíthetnek megoldani a problémát:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Belső hiba, az AutoRemover sérült" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -742,7 +744,7 @@ msgstr[1] "" "A következő csomagok automatikusan lettek telepítve, és már nincs rájuk " "szükség:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -751,22 +753,22 @@ msgstr[0] "%lu csomag automatikusan lett telepítve, és már nincs rá szüksé msgstr[1] "" "%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Ezt az „apt-get autoremove” paranccsal törölheti." msgstr[1] "Ezeket az „apt-get autoremove” paranccsal törölheti." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, az AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Próbálja futtatni az „apt-get -f install” parancsot az alábbiak javításához:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -774,7 +776,7 @@ msgstr "" "Teljesítetlen függőségek. Próbálja kiadni az „apt-get -f install” parancsot " "csomagok nélkül (vagy telepítse a függőségeket is!)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -786,33 +788,33 @@ msgstr "" "használja, 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:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s megjelölve automatikusan telepítettként.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -820,47 +822,47 @@ msgstr "" "Ez a parancs elavult. Használja helyette az „apt-mark auto” és az „apt-mark " "auto” parancsokat." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, a problémamegoldó hibát okozott" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Nem lehet zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Letöltés: %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -870,7 +872,7 @@ msgstr "" "karbantartva:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -881,70 +883,70 @@ msgstr "" "bzr branch %s\n" "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, 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:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "„%s” kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "„%s” elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -953,17 +955,17 @@ msgstr "" "Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal " "kapcsolatban lásd az apt.conf(5) APT::Architectures részét." -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási függőségeinek információit letölteni" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, 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:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -972,7 +974,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem " "engedélyezett a(z) „%4$s” csomagokon" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -981,14 +983,14 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem " "található" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl " "friss" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -997,7 +999,7 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető " "verziója nem elégíti ki a verziókövetelményeket" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1006,30 +1008,30 @@ msgstr "" "%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs " "jelölt verziója" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetők ki." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Változási napló ehhez: %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1118,7 +1120,7 @@ msgstr "" "információkért és opciókért.\n" " Ez az APT a SzuperTehén Hatalmával rendelkezik.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1740,7 +1742,7 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" @@ -2796,7 +2798,7 @@ msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2805,12 +2807,12 @@ msgstr "" "Nem lehetett a(z) „%s” közvetlen beállítását végrehajtani. A részletekért " "lásd a man 5 apt.conf oldalt az APT::Immediate-Configure címszó alatt. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "A(z) „%s” beállítása sikertelen" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2845,7 +2847,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2994,22 +2996,22 @@ msgstr "" "A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása " "közben" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Csomaglisták olvasása" # FIXME -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "„Biztosítja” kapcsolatok összegyűjtése" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" diff --git a/po/it.po b/po/it.po index 51d09990d..98269398e 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-06-25 21:54+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Tabella versione:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -490,7 +490,7 @@ msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n" msgid "%s is already the newest version.\n" msgstr "%s è già alla versione più recente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "È stato impostato %s per l'installazione manuale.\n" @@ -601,8 +601,8 @@ msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero in %s" @@ -612,17 +612,19 @@ msgstr "Impossibile determinare lo spazio libero in %s" msgid "You don't have enough free space in %s." msgstr "Spazio libero in %s insufficiente." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "È stata specificata la modalità \"Trivial Only\", ma questa non è " "un'operazione banale." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Sì, esegui come da richiesta." -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -633,28 +635,28 @@ msgstr "" "Per continuare scrivere la frase \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Interrotto." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Scaricamento di alcuni file non riuscito" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Scaricamento completato e in modalità solo scaricamento" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -662,19 +664,19 @@ msgstr "" "Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-" "get update\" o provare l'opzione \"--fix-missing\"." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su supporti estraibili non è ancora supportato" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Impossibile correggere i pacchetti mancanti." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Interruzione dell'installazione." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -688,36 +690,36 @@ msgstr[1] "" "I seguenti pacchetti sono spariti dal sistema poiché\n" "tutti i file sono stati sovrascritti da altri pacchetti:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: questo viene svolto automaticamente e volutamente da dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorato il rilascio non disponibile \"%s\" del pacchetto \"%s\"" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorata la versione \"%s\" non disponibile del pacchetto \"%s\"" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -735,15 +737,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Errore interno, AutoRemover ha rovinato qualche cosa" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -756,7 +758,7 @@ msgstr[1] "" "I seguenti pacchetti sono stati installati automaticamente e non sono più " "richiesti:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -767,22 +769,22 @@ msgstr[1] "" "%lu pacchetti sono stati installati automaticamente e non sono più " "richiesti.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Usare \"apt-get autoremove\" per rimuoverlo." msgstr[1] "Usare \"apt-get autoremove\" per rimuoverli." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "È utile eseguire \"apt-get -f install\" per correggere questi problemi:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -790,7 +792,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti " "(o specificare una soluzione)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -802,33 +804,33 @@ msgstr "" "usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n" "non sono ancora stati creati o sono stati rimossi da Incoming." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Pacchetti danneggiati" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti saranno inoltre installati:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare il pacchetto %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s impostato automaticamente come installato.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -836,48 +838,48 @@ msgstr "" "Questo comando è deprecato. Utilizzare \"apt-mark auto\" e \"apt-mark manual" "\" al suo posto." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Non riuscito" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Eseguito" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Impossibile bloccare la directory di scaricamento" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\"" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Scaricamento di %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" "È necessario specificare almeno un pacchetto di cui recuperare il sorgente" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -887,7 +889,7 @@ msgstr "" "all'interno del sistema di controllo della versione \"%s\" presso:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -899,70 +901,70 @@ msgstr "" "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del " "pacchetto.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s è insufficiente" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario recuperare %sB/%sB di sorgenti.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario scaricare %sB di sorgenti.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Recupero sorgente %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Recupero di alcuni archivi non riuscito." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione \"%s\" non riuscito.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando \"%s\" di generazione non riuscito.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Creazione processo figlio non riuscita" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "È necessario specificare almeno un pacchetto di cui controllare le " "dipendenze di generazione" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -971,17 +973,17 @@ msgstr "" "Informazioni sull'architettura non disponibili per %s. Consultare apt.conf" "(5) APT::Architectures per l'impostazione" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -990,7 +992,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché %s non è " "consentito su pacchetti \"%s\"" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -999,14 +1001,14 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " "non può essere trovato" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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 recente" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1015,7 +1017,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché la versione " "candidata del pacchetto %s non può soddisfare i requisiti di versione" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1024,30 +1026,30 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s " "non ha una versione candidata" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s non è stata soddisfatta: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Le dipendenze di generazione per %s non sono state soddisfatte." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Elaborazione delle dipendenze di generazione non riuscita" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog per %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1137,7 +1139,7 @@ msgstr "" "apt-get(8), sources.list(5) e apt.conf(5).\n" " Questo APT ha i poteri della Super Mucca.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1767,7 +1769,7 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Impossibile scrivere in %s" @@ -2832,7 +2834,7 @@ msgstr "La riga %u nel file %s non è corretta (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2842,12 +2844,12 @@ msgstr "" "maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::" "Immediate-Configure\" (%d)." -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Impossibile configurare \"%s\". " -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2885,7 +2887,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3038,22 +3040,22 @@ msgstr "" "Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle " "dipendenze" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Lettura elenco dei pacchetti" # (ndt) non mi convince per niente, ma vediamo cosa salta fuori -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Il file fornisce" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvare la cache sorgente" diff --git a/po/ja.po b/po/ja.po index fb455abcc..48ee00f58 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-07-01 00:14+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -155,7 +155,7 @@ msgid " Version table:" msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -485,7 +485,7 @@ msgstr "ダウンロードできないため、%s の再インストールは不 msgid "%s is already the newest version.\n" msgstr "%s はすでに最新バージョンです。\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" @@ -595,8 +595,8 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま msgid "After this operation, %sB disk space will be freed.\n" msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" @@ -606,15 +606,17 @@ msgstr "%s の空き領域を測定できません" msgid "You don't have enough free space in %s." msgstr "%s に充分な空きスペースがありません。" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -625,28 +627,28 @@ msgstr "" "続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "中断しました。" -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -654,19 +656,19 @@ msgstr "" "いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-" "missing オプションを付けて試してみてください。" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "足りないパッケージを直すことができません。" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "インストールを中断します。" -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -677,36 +679,36 @@ msgstr[0] "" "以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n" "システムから消えました:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意: これは dpkg により自動でわざと行われれます。" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "パッケージ '%2$s' の利用できないターゲットリリース '%1$s' を無視" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "パッケージ '%2$s' の利用できないバージョン '%1$s' を無視" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "一連のものを削除するようになっていないので、AutoRemover を開始できません" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -724,15 +726,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部エラー、AutoRemover が何かを破壊しました" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -741,7 +743,7 @@ msgid_plural "" msgstr[0] "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -750,22 +752,22 @@ msgstr[0] "" "%lu つのパッケージが自動でインストールされましたが、もう必要とされていませ" "ん:\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -773,7 +775,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -785,33 +787,33 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s は自動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -819,47 +821,47 @@ msgstr "" "このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わり" "に使用してください。" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "%s %s をダウンロードしています" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -869,7 +871,7 @@ msgstr "" "ます:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -881,70 +883,70 @@ msgstr "" "bzr branch %s\n" "を使用してください。\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -953,17 +955,17 @@ msgstr "" "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt.conf" "(5) の APT::Architectures を参照してください。" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -972,7 +974,7 @@ msgstr "" "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s " "の依存関係を満たすことができません" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -981,14 +983,14 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -997,7 +999,7 @@ msgstr "" "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた" "め、%2$s に対する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1006,30 +1008,30 @@ msgstr "" "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関" "係を満たすことができません" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) の変更履歴" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1121,7 +1123,7 @@ msgstr "" "apt-get(8)、sources.list(5)、apt.conf(5) を参照してください。\n" " この APT は Super Cow Powers 化されています。\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1734,7 +1736,7 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" @@ -2779,7 +2781,7 @@ msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2788,12 +2790,12 @@ msgstr "" "'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::" "Immediate-Configure の項を参照してください。(%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "'%s' を設定できませんでした。" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2829,7 +2831,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2980,21 +2982,21 @@ msgstr "この APT が対応している以上の数の依存関係が発生し msgid "Package %s %s was not found while processing file dependencies" msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "パッケージリストを読み込んでいます" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "ファイル提供情報を収集しています" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" diff --git a/po/km.po b/po/km.po index 78ae4d462..578e246a7 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " តារាង​កំណែ ៖" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -488,7 +488,7 @@ msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវ msgid "%s is already the newest version.\n" msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" @@ -595,8 +595,8 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កា msgid "After this operation, %sB disk space will be freed.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ" @@ -606,15 +606,17 @@ msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ msgid "You don't have enough free space in %s." msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -625,28 +627,28 @@ msgstr "" "ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "បោះបង់ ។" -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -654,19 +656,19 @@ msgstr "" "អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --" "fix- ដែលបាត់ឬ់ ?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -676,35 +678,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -720,16 +722,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -739,7 +741,7 @@ msgid_plural "" msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -747,28 +749,28 @@ msgid_plural "" msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -780,85 +782,85 @@ msgstr "" "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n" " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "កញ្ចប់​ដែល​បាន​ខូច​" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "បាន​បរាជ័យ" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "ធ្វើរួច​" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -866,104 +868,104 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូល​ប្រភព​ %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។" -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -972,37 +974,37 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​" "តម្រូវការ​កំណែបានឡើយ" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ " -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1087,7 +1089,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1673,7 +1675,7 @@ msgstr "" " -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "មិន​អាច​សរសេរ​ទៅ %s" @@ -2709,19 +2711,19 @@ msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2755,7 +2757,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2897,21 +2899,21 @@ msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអា msgid "Package %s %s was not found while processing file dependencies" msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​" diff --git a/po/ko.po b/po/ko.po index 6d1527870..0c0b978d6 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -151,7 +151,7 @@ msgid " Version table:" msgstr " 버전 테이블:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -479,7 +479,7 @@ msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드 msgid "%s is already the newest version.\n" msgstr "%s 패키지는 이미 최신 버전입니다.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" @@ -589,8 +589,8 @@ msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩 msgid "After this operation, %sB disk space will be freed.\n" msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" @@ -600,18 +600,20 @@ msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " "아닙니다." # 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -622,28 +624,28 @@ msgstr "" "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "중단." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "일부 파일을 받는데 실패했습니다" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -651,19 +653,19 @@ msgstr "" "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" "missing 옵션을 줘서 실행해야 할 것입니다." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "빠진 패키지를 바로잡을 수 없습니다." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "설치를 중단합니다." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -674,35 +676,35 @@ msgstr[0] "" "다음 패키지는 패키지의 파일을 모두 다른 패키지가\n" "덮어썼기 때문에 사라졌습니다:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "'%2$s' 패키지의 '%1$s' 대상 릴리스는 없으므로 무시합니다." -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "소스 패키지로 '%s'을(를) '%s' 대신 선택합니다\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "'%2$s' 패키지의 '%1$s' 버전은 없으므로 무시합니다." -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -720,15 +722,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -736,29 +738,29 @@ msgid_plural "" "required:" msgstr[0] "다음 패키지가 자동으로 설치되었지만 더 이상 필요하지 않습니다:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "패키지 %lu개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "이들을 지우려면 'apt-get autoremove'를 사용하십시오." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -766,7 +768,7 @@ msgstr "" "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -777,78 +779,78 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "망가진 패키지" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "다음 패키지를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "제안하는 패키지:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "추천하는 패키지:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "%s 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 패키지는 수동설치로 지정합니다.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "다운로드 디렉터리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -857,7 +859,7 @@ msgstr "" "알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, fuzzy, c-format msgid "" "Please use:\n" @@ -868,85 +870,85 @@ msgstr "" "다음과 같이 하십시오:\n" "bzr get %s\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는데 실패했습니다." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -955,7 +957,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -964,14 +966,14 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -980,7 +982,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -989,30 +991,30 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는데 실패했습니다" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1100,7 +1102,7 @@ msgstr "" "apt.conf(5) 매뉴얼 페이지를 보십시오.\n" " 이 APT는 Super Cow Powers로 무장했습니다.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1694,7 +1696,7 @@ msgstr "" " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" @@ -2732,7 +2734,7 @@ msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2741,12 +2743,12 @@ msgstr "" "'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에" "서 APT::Immediate-Configure 항목을 보십시오. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "'%s' 파일을 열 수 없습니다" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2781,7 +2783,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2924,21 +2926,21 @@ msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습 msgid "Package %s %s was not found while processing file dependencies" msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "패키지 목록을 읽는 중입니다" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다" diff --git a/po/ku.po b/po/ku.po index 6e14e08d6..befc58323 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Tabloya guhertoyan:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -446,7 +446,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s jixwe guhertoya nûtirîn e.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "lê %s dê were sazkirin" @@ -553,8 +553,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" @@ -564,15 +564,17 @@ msgstr "Nikarî cihê vala li %s tesbît bike" msgid "You don't have enough free space in %s." msgstr "Cihê vala li %s têre nake." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Erê, wusa bike!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -580,46 +582,46 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Betal." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Dixwazî bidomînî [E/n]?" -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Daxistina çend pelan biserneket" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Sazkirin tê betalkirin." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -629,35 +631,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -673,15 +675,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -691,7 +693,7 @@ msgid_plural "" msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:" msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -699,27 +701,27 @@ msgid_plural "" msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:" msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -727,85 +729,85 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Paketên şikestî" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Paketên tên pêşniyaz kirin:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Paketên tên tawsiyê kirin:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Bilindkirin tê hesibandin..." -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Serneket" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Temam" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Pelrêça daxistinê nayê quflekirin" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -813,141 +815,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Girêdan bi %s (%s) re pêk tê" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -993,7 +995,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1564,7 +1566,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Nivîsandin ji bo %s ne pêkane" @@ -2551,19 +2553,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nikarî pelê %s veke" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2592,7 +2594,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2731,21 +2733,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Lîsteya pakêtan tê xwendin" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "" diff --git a/po/lt.po b/po/lt.po index 754d721d3..e159afa43 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " Versijų lentelė:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -450,7 +450,7 @@ msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n" msgid "%s is already the newest version.\n" msgstr "%s ir taip jau yra naujausias.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" @@ -558,8 +558,8 @@ msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" @@ -569,15 +569,17 @@ msgstr "Nepavyko nustatyti %s laisvos vietos" msgid "You don't have enough free space in %s." msgstr "%s nėra pakankamai laisvos vietos." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Taip, daryk kaip liepiu!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -588,28 +590,28 @@ msgstr "" "Jei norite tęsti, įveskite frazę „%s“\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Nutraukti." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Ar norite tęsti [T/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Nepavyko parsiųsti kai kurių failų" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -617,19 +619,19 @@ msgstr "" "Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ " "arba pabandykite su parametru --fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Nepavyko pataisyti dingusių paketų." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Diegimas nutraukiamas." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -639,35 +641,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Atnaujinimo komandai argumentų nereikia" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -683,15 +685,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Ši informacija gali padėti išspręsti šią situaciją:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -701,7 +703,7 @@ msgid_plural "" msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -709,22 +711,22 @@ msgid_plural "" msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“" msgstr[1] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -732,7 +734,7 @@ msgstr "" "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be " "nurodytų paketų (arba nurodykite išeitį)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -744,85 +746,85 @@ msgstr "" "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n" "pašalinti iš \"Incoming\" aplanko." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Sugadinti paketai" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Bus įdiegti šie papildomi paketai:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Siūlomi paketai:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Rekomenduojami paketai:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Skaičiuojami atnaujinimai... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Nepavyko" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Įvykdyta" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Nepavyko užrakinti parsiuntimų aplanko" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -830,85 +832,85 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Jau išpakuotas archyvas %s praleidžiama\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -916,7 +918,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -924,14 +926,14 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra " "per naujas" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -940,7 +942,7 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -948,30 +950,30 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Jungiamasi prie %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1017,7 +1019,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1604,7 +1606,7 @@ msgstr "" " -c=? Nuskaityti šį konfigūracijų failą\n" " -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Nepavyko įrašyti į %s" @@ -2645,19 +2647,19 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nepavyko atverti failo %s" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2686,7 +2688,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2830,21 +2832,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Skaitomi paketų sąrašai" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "" diff --git a/po/mr.po b/po/mr.po index 524521952..1bedf2b34 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -154,7 +154,7 @@ msgid " Version table:" msgstr "आवृत्ती कोष्टक:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -482,7 +482,7 @@ msgstr "%s चे पुनर्संस्थापन शक्य नाह msgid "%s is already the newest version.\n" msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" @@ -589,8 +589,8 @@ msgstr "या क्रियेनंतर, %sB एवढी अधिक ड msgid "After this operation, %sB disk space will be freed.\n" msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" @@ -600,15 +600,17 @@ msgstr "%s मध्ये रिकामी जागा सांगू श msgid "You don't have enough free space in %s." msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "हो, मी म्ह्टल्याप्रमाणे करा!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -619,28 +621,28 @@ msgstr "" "पुढे '%s' उक्ती मध्ये लिहिणार \n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "व्यत्यय/बंद करा." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -648,20 +650,20 @@ msgstr "" "काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- " "बरोबर प्रयत्न कराहरवलेले/गहाळ?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "संस्थापन खंडित करत आहे." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -671,35 +673,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -717,15 +719,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -735,7 +737,7 @@ msgid_plural "" msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -743,24 +745,24 @@ msgid_plural "" msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा." msgstr[1] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " "लागेल'यात बदल करण्यासाठी:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -768,7 +770,7 @@ msgstr "" "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -780,85 +782,85 @@ msgstr "" "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n" "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "तुटलेली पॅकेजेस" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "सुचवलेली पॅकेजेस:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "शिफारस केलेली पॅकेजेस:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "असमर्थ" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "झाले" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -866,104 +868,104 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -972,37 +974,37 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) ला जोडत आहे" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1089,7 +1091,7 @@ msgstr "" " apt.conf(5) पुस्तिका पाने पहा.\n" " ह्या APT ला सुपर काऊ पॉवर्स आहेत\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1678,7 +1680,7 @@ msgstr "" " -c=? ही संरचना संचिका वाचा \n" " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "%s मध्ये लिहिण्यास असमर्थ " @@ -2713,19 +2715,19 @@ msgstr "स्त्रोत सुची %s (प्रकार) मध्य msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2760,7 +2762,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2907,21 +2909,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही " -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "पॅकेज याद्या वाचत आहोत" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" diff --git a/po/nb.po b/po/nb.po index 51e5cf196..397e74536 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -490,7 +490,7 @@ msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n" msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" @@ -599,8 +599,8 @@ msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" @@ -610,16 +610,18 @@ msgstr "Klarte ikke bestemme ledig plass i %s" msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Ja, gjør som jeg sier!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -630,28 +632,28 @@ msgstr "" "For å fortsette skriv inn teksten «%s»\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Klarte ikke laste ned alle filene" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -659,19 +661,19 @@ msgstr "" "Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller " "«--fix-missing»." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og bytte av media støttes nå ikke" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Klarer ikke å rette på manglende pakker." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Avbryter installasjonen." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -685,35 +687,35 @@ msgstr[1] "" "De følgende pakkene forsvant fra systemet ditt siden\n" "alle filene er overskrevet av andre pakker:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorer utilgjengelig målutgave «%s» av pakke «%s»" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Velger «%s» som kildepakke istedenfor «%s»\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -731,15 +733,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -750,7 +752,7 @@ msgstr[0] "" msgstr[1] "" "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -758,22 +760,22 @@ msgid_plural "" msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n" msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Bruk «apt-get autoremove» for å fjerne dem." msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -781,7 +783,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -793,78 +795,78 @@ msgstr "" "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s satt til automatisk installasjon.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Utført" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemløser ødela noe" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -873,7 +875,7 @@ msgstr "" "MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, fuzzy, c-format msgid "" "Please use:\n" @@ -884,106 +886,106 @@ msgstr "" "bzr get %s\n" "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil «%s»\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, 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:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -992,37 +994,37 @@ 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:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kobler til %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1111,7 +1113,7 @@ msgstr "" "for mer informasjon og flere valg.\n" " Denne APT har kraften til en Superku.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1712,7 +1714,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" @@ -2753,7 +2755,7 @@ msgstr "Feil på %u i kildelista %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2762,12 +2764,12 @@ msgstr "" "Klarte ikke gjennomføre umiddelbar konfigurasjon av «%s». Se man 5 apt.conf " "under APT::Immediate-Configure for detaljer. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Klarte ikke åpne fila «%s»" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2802,7 +2804,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2946,21 +2948,21 @@ msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer." msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Leser pakkelister" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" diff --git a/po/ne.po b/po/ne.po index 302d8c661..672ecbdc2 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " संस्करण तालिका:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -486,7 +486,7 @@ msgstr " %s को पुन: स्थापना सम्भव छैन, msgid "%s is already the newest version.\n" msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" @@ -593,8 +593,8 @@ msgstr "अनप्याक गरिसके पछि थप डिस् msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" @@ -604,15 +604,17 @@ msgstr " %s मा खाली ठाऊँ निर्धारण गर् msgid "You don't have enough free space in %s." msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "हो,मैले भने जस्तै गर्नुहोस्!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -623,28 +625,28 @@ msgstr "" "निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "परित्याग गर्नुहोस् ।" -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -652,19 +654,19 @@ msgstr "" "केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास " "गर्नुहुन्छ ?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "स्थापना परित्याग गरिदैछ ।" -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -674,35 +676,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -718,16 +720,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -737,7 +739,7 @@ msgid_plural "" msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -745,21 +747,21 @@ msgid_plural "" msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -767,7 +769,7 @@ msgstr "" "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा " "समाधान निर्दिष्ट गर्नुहोस्) ।" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -780,85 +782,85 @@ msgstr "" " वितरण अहिले सम्म सिर्जना\n" " भएको छैन वा आवगमन विनानै सर्यो ।" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "असफल भयो" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -866,104 +868,104 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -972,37 +974,37 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1087,7 +1089,7 @@ msgstr "" "pages हेर्नुहोस् ।\n" " APT संग सुपर काउ शक्तिहरू छ ।\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1676,7 +1678,7 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr " %s मा लेख्न असक्षम" @@ -2711,19 +2713,19 @@ msgstr "वैरुप्य लाइन %u स्रोत सूचिमा msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2757,7 +2759,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2900,21 +2902,21 @@ msgstr "वाऊ, APT ले सक्षम गरेको निर्भर msgid "Package %s %s was not found while processing file dependencies" msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "प्याकेज सूचिहरू पढिदैछ" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" diff --git a/po/nl.po b/po/nl.po index 0579b1199..67840c55b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " Versietabel:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -492,7 +492,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" @@ -602,8 +602,8 @@ msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" @@ -613,15 +613,17 @@ msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" msgid "You don't have enough free space in %s." msgstr "U heeft onvoldoende vrije schijfruimte op %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -632,28 +634,28 @@ msgstr "" "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Afbreken." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -661,19 +663,19 @@ msgstr "" "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Installatie wordt afgebroken." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -687,35 +689,35 @@ msgstr[1] "" "De volgende pakketten zijn van uw systeem verdwenen omdat\n" "alle bestanden zijn overschreven door andere pakketten:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Negeer niet beschikbare doelrelease '%s' van pakket '%s'" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "'%s' wordt genomen als bronpakket in plaats van '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Negeer niet beschikbare versie '%s' van pakket '%s'" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "De opdracht 'update' aanvaard geen argumenten" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -733,15 +735,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -753,7 +755,7 @@ msgstr[1] "" "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " "nodig:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -762,24 +764,24 @@ msgstr[0] "%lu pakket is automatisch geïnstalleerd en is niet langer nodig.\n" msgstr[1] "" "%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "U kunt deze verwijderen via 'apt-get autoremove'." msgstr[1] "U kunt deze verwijderen via 'apt-get autoremove'." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -787,7 +789,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:1972 +#: cmdline/apt-get.cc:1974 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" @@ -798,80 +800,80 @@ 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:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s is ingesteld op automatische geïnstalleerd.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -881,7 +883,7 @@ msgstr "" "'%s' op:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, fuzzy, c-format msgid "" "Please use:\n" @@ -893,87 +895,87 @@ msgstr "" "om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op " "te halen.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -982,7 +984,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -991,14 +993,14 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1007,7 +1009,7 @@ 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:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1016,30 +1018,30 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1128,7 +1130,7 @@ msgstr "" "voor meer informatie en opties.\n" " Deze APT heeft Super Koe kracht.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1738,7 +1740,7 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" @@ -2789,7 +2791,7 @@ msgstr "Misvormde regel %u in bronlijst %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2798,12 +2800,12 @@ msgstr "" "Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie " "'man 5 apt.conf', onder APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Kon het bestand '%s' niet openen" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2840,7 +2842,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2994,21 +2996,21 @@ msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" diff --git a/po/nn.po b/po/nn.po index 278de9eba..95b70357e 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -495,7 +495,7 @@ msgstr "%s kan ikkje installerast p msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" @@ -604,8 +604,8 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" @@ -615,16 +615,18 @@ msgstr "Du har ikkje nok ledig plass i %s" msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Trivial Only var spesifisert, men dette er ikkje noka triviell handling." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -635,28 +637,28 @@ msgstr "" "For halda fram, m du skriva nyaktig %s.\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Avbryt." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -664,19 +666,19 @@ msgstr "" "Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller " "--fix-missing." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og byte av medium er ikkje sttta for tida" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Avbryt installasjon." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -686,35 +688,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Klarte ikkje f status p kjeldepakkelista %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -730,16 +732,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -749,7 +751,7 @@ msgid_plural "" msgstr[0] "Dei flgjande NYE pakkane vil verta installerte:" msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -757,22 +759,22 @@ msgid_plural "" msgstr[0] "Dei flgjande NYE pakkane vil verta installerte:" msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -780,7 +782,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -792,86 +794,86 @@ 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:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -879,105 +881,105 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, 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:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -986,37 +988,37 @@ 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:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Koplar til %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1102,7 +1104,7 @@ msgstr "" "til apt-get(8), sources.list(5) og apt.conf(5).\n" " APT har superku-krefter.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1691,7 +1693,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" @@ -2724,19 +2726,19 @@ msgstr "Misforma linje %u i kjeldelista %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2772,7 +2774,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2919,21 +2921,21 @@ msgstr "J msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Les pakkelister" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" diff --git a/po/pl.po b/po/pl.po index 246c32e97..04eba799f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Tabela wersji:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -490,7 +490,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s jest już w najnowszej wersji.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" @@ -599,8 +599,8 @@ msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" @@ -610,16 +610,18 @@ msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy." # Bezpieczniej jest nie używać tu polskich znaków. -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Tak, jestem pewien!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -630,28 +632,28 @@ msgstr "" "Aby kontynuować proszę napisać zdanie \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Przerwane." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Kontynuować [T/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Nie udało się pobrać niektórych plików" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -659,19 +661,19 @@ msgstr "" "Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get " "update lub użyć opcji --fix-missing." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Nie udało się poprawić brakujących pakietów." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Przerywanie instalacji" -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -688,35 +690,35 @@ msgstr[2] "" "Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki " "zostały nadpisane przez inne pakiety:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Uwaga: dpkg wykonał to automatycznie i celowo." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorowanie niedostępnego wydania docelowego %s pakietu %s" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Zmieniono wybrany pakiet źródłowy na \"%s\" z \"%s\"\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorowanie niedostępnej wersji \"%s\" pakietu \"%s\"" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga żadnych argumentów" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -734,15 +736,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Błąd wewnętrzny spowodowany przez AutoRemover" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -758,7 +760,7 @@ msgstr[2] "" "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej " "wymagane:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -773,23 +775,23 @@ msgstr[2] "" "%lu pakietów zostało zainstalowanych automatycznie i nie są już więcej " "wymagane.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Aby go usunąć należy użyć \"apt-get autoremove\"." msgstr[1] "Aby je usunąć należy użyć \"apt-get autoremove\"." msgstr[2] "Aby je usunąć należy użyć \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Należy uruchomić \"apt-get -f install\", aby naprawić poniższe problemy:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -797,7 +799,7 @@ msgstr "" "Niespełnione zależności. Proszę spróbować wykonać \"apt-get -f install\" bez " "pakietów (lub podać rozwiązanie)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -809,33 +811,33 @@ msgstr "" "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzące\")." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Pakiety są uszkodzone" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s zaznaczony jako zainstalowany automatycznie.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -843,48 +845,48 @@ msgstr "" "To polecenie jest przestarzałe. Prosimy używać \"apt-mark auto\" i \"apt-" "mark manual\"." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Nie udało się" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\"" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Pobieranie %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, 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:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -894,7 +896,7 @@ msgstr "" "pod adresem:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -906,70 +908,70 @@ msgstr "" "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego " "pakietu.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Pobieranie źródeł %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " "zależności dla budowania" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -978,17 +980,17 @@ msgstr "" "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -997,7 +999,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone " "w pakietach \"%s\"" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1006,14 +1008,14 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1022,7 +1024,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja " "pakietu %s nie spełnia wymagań wersji" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1031,30 +1033,30 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma " "wersji kandydującej" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Dziennik zmian %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1142,7 +1144,7 @@ msgstr "" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1772,7 +1774,7 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Nie udało się pisać do %s" @@ -2821,7 +2823,7 @@ msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2831,12 +2833,12 @@ msgstr "" "5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć " "się więcej. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Nie udało się skonfigurować \"%s\". " -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2873,7 +2875,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3017,21 +3019,21 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Czytanie list pakietów" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Zbieranie zapewnień plików" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł" diff --git a/po/pt.po b/po/pt.po index 0127d3f4c..05fcc2142 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " Tabela de Versão:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -487,7 +487,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s já está na versão mais recente.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s está definido para ser instalado manualmente.\n" @@ -596,8 +596,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Após esta operação, será libertado %sB de espaço em disco.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" @@ -607,15 +607,17 @@ msgstr "Não foi possível determinar o espaço livre em %s" 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:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas isto não é uma operação trivial." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -626,28 +628,28 @@ msgstr "" "Para continuar escreva a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -655,19 +657,19 @@ msgstr "" "Não foi possível obter alguns arquivos, tente talvez correr apt-get update " "ou tente com --fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Não foi possível corrigir os pacotes em falta." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "A abortar a instalação." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -681,35 +683,35 @@ msgstr[1] "" "Os seguintes pacotes desapareceram do seu sistema pois\n" "todos os ficheiros foram por outros pacotes:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorar o lançamento pretendido, não disponível, '%s' do pacote '%s'" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "A escolher '%s' como pacote pacote de código fonte em vez de '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorar a versão '%s', não disponível, do pacote '%s'" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -727,15 +729,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o AutoRemover estragou coisas" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -747,7 +749,7 @@ msgstr[1] "" "Os seguintes pacotes foram instalados automaticamente e já não são " "necessários:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -756,21 +758,21 @@ msgstr[0] "O pacote %lu foi instalado automaticamente e já não é necessário. msgstr[1] "" "Os pacotes %lu foram instalados automaticamente e já não são necessários.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Utilize 'apt-get autoremove' para o remover." msgstr[1] "Utilize 'apt-get autoremove' para os remover." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Você deve querer executar 'apt-get -f install' para corrigir estes:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -778,7 +780,7 @@ msgstr "" "Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -790,33 +792,33 @@ msgstr "" "distribuição unstable em que alguns pacotes pedidos ainda não foram \n" "criados ou foram movidos do Incoming." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s está definido para ser instalado automaticamente.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -824,46 +826,46 @@ msgstr "" "Este comando foi depreceado. Em vez disso, por favor utilize 'apt-mark auto' " "e 'apt-mark manual'." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "A calcular a actualização... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Impossível criar acesso exclusivo ao directório de downloads" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "A obter %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Não foi possível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -873,7 +875,7 @@ msgstr "" "'%s' em:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -884,71 +886,71 @@ msgstr "" "bzr branch %s\n" "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "É necessário obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "A saltar a descompactação do pacote de código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -957,18 +959,18 @@ msgstr "" "Nenhuma informação de arquitectura disponível para %s. Para configuração " "veja apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Não foi possível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -977,7 +979,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque %s não é permitido " "em pacotes '%s'" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -986,14 +988,14 @@ msgstr "" "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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: O pacote instalado %s é " "demasiado novo" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1002,7 +1004,7 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque a versão " "candidata do pacote %s não pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1011,30 +1013,30 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque o pacote %s não " "tem versão candidata" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, 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:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Changlog para %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1124,7 +1126,7 @@ msgstr "" "apt-get(8), sources.list(5) e apt.conf(5)\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1749,7 +1751,7 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Não conseguiu escrever para %s" @@ -2799,7 +2801,7 @@ msgstr "Linha mal formada %u na lista de fontes %s (tipo)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2808,12 +2810,12 @@ msgstr "" "Não foi possível proceder à configuração imediata em '%s'. Para detalhes, " "por favor veja man 5 apt.conf em APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Não pode configurar '%s'. " -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2852,7 +2854,7 @@ msgstr "" "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) " "estragados." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3005,21 +3007,21 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "A ler as listas de pacotes" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "A obter File Provides" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6d578fd09..593a509e3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Tabela de versiuni:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -487,7 +487,7 @@ msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" msgid "%s is already the newest version.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" @@ -595,8 +595,8 @@ msgstr "După această operație vor fi folosiți din disc încă %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" @@ -606,16 +606,18 @@ msgstr "N-am putut determina spațiul disponibil în %s" msgid "You don't have enough free space in %s." msgstr "Nu aveți suficient spațiu în %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Da, fă cum îți spun!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -626,28 +628,28 @@ msgstr "" "Pentru a continua tastați fraza '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Renunțare." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Vreți să continuați [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Descărcarea unor fișiere a eșuat" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -655,19 +657,19 @@ msgstr "" "Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get " "update' sau încercați cu --fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Abandonez instalarea." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -678,36 +680,36 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nu pot determina starea listei surse de pachete %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" # XXX: orice sugestie este bine-venită -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -726,15 +728,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -748,7 +750,7 @@ msgstr[1] "" msgstr[2] "" "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -760,7 +762,7 @@ msgstr[1] "" msgstr[2] "" "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." @@ -768,15 +770,15 @@ msgstr[0] "Folosiți 'apt-get autoremove' pentru a le șterge." msgstr[1] "Folosiți 'apt-get autoremove' pentru a le șterge." msgstr[2] "Folosiți 'apt-get autoremove' pentru a le șterge." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -784,7 +786,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:1972 +#: cmdline/apt-get.cc:1974 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" @@ -797,86 +799,86 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Eșec" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Nu s-a putut bloca directorul de descărcare" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu s-a putut găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -884,87 +886,87 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, 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:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -973,7 +975,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:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -982,14 +984,14 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -998,7 +1000,7 @@ 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:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1007,30 +1009,30 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, 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:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectare la %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1119,7 +1121,7 @@ msgstr "" "pentru mai multe informații și opțiuni.\n" " Acest APT are puterile unei Super Vaci.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1718,7 +1720,7 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Nu s-a putut scrie în %s" @@ -2768,19 +2770,19 @@ msgstr "Linie greșită %u în lista sursă %s (tip)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2816,7 +2818,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2968,21 +2970,21 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Citire liste de pachete" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Colectare furnizori fișier" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" diff --git a/po/ru.po b/po/ru.po index c60c9a384..5cf651fff 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Таблица версий:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -490,7 +490,7 @@ msgstr "Переустановка %s невозможна, он не скачи msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" @@ -605,8 +605,8 @@ msgstr "" "После данной операции, объём занятого дискового пространства уменьшится на " "%sB.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" @@ -616,17 +616,19 @@ msgstr "Не удалось определить количество свобо msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " "операция." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -637,28 +639,28 @@ msgstr "" "Чтобы продолжить, введите фразу: «%s»\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Аварийное завершение." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Некоторые файлы скачать не удалось" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Указан режим «только скачивание», и скачивание завершено" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -666,19 +668,19 @@ msgstr "" "Невозможно получить некоторые архивы, вероятно надо запустить apt-get update " "или попытаться повторить запуск с ключом --fix-missing" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Аварийное завершение установки." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -695,35 +697,35 @@ msgstr[2] "" "Следующие пакеты исчез из системы, так как все их файлы\n" "теперь берутся из других пакетов:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Замечание: это сделано автоматически и специально программой dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Игнорируется недоступный выпуск «%s» пакета «%s»" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Используется «%s» в качестве исходного пакета вместо «%s»\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Игнорируется недоступная версия «%s» пакета «%s»" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -741,15 +743,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутренняя ошибка, AutoRemover всё поломал" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -761,7 +763,7 @@ msgstr[1] "" msgstr[2] "" "Следующие пакеты устанавливались автоматически и больше не требуются:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -770,24 +772,24 @@ msgstr[0] "%lu пакет был установлен автоматически msgstr[1] "%lu пакета было установлено автоматически и больше не требуется.\n" msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Для его удаления используйте «apt-get autoremove»." msgstr[1] "Для их удаления используйте «apt-get autoremove»." msgstr[2] "Для их удаления используйте «apt-get autoremove»." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade всё поломал" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -" "f install»:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -795,7 +797,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -806,33 +808,33 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s выбран для автоматической установки.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -840,47 +842,47 @@ msgstr "" "Эта команда устарела. Используйте вместо неё «apt-mark auto» и «apt-mark " "manual»." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Расчёт обновлений…" -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Выполняется загрузка %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -889,7 +891,7 @@ msgstr "" "ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -900,70 +902,70 @@ msgstr "" "bzr branch %s\n" "для получения последних (возможно не выпущенных) обновлений пакета.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл «%s»\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -972,17 +974,17 @@ msgstr "" "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -991,7 +993,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как %s не " "разрешён для пакетов «%s»" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1000,14 +1002,14 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1016,7 +1018,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как версия-" "кандидат пакета %s не может удовлетворить требованиям по версии" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1025,30 +1027,30 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "имеет версии-кандидата" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog для %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1140,7 +1142,7 @@ msgstr "" "содержится подробная информация и описание параметров.\n" " В APT есть коровья СУПЕРСИЛА.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1765,7 +1767,7 @@ msgstr "" " -c=? Читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@ -2824,7 +2826,7 @@ msgstr "Искажённая строка %u в списке источнико msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2833,12 +2835,12 @@ msgstr "" "Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 " "apt.conf о APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Не удалось настроить «%s»." -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2875,7 +2877,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3024,21 +3026,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Чтение списков пакетов" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников" diff --git a/po/sk.po b/po/sk.po index 83396a1a4..ece547d5c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Tabuľka verzií:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -484,7 +484,7 @@ msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n" msgid "%s is already the newest version.\n" msgstr "%s je už najnovšej verzie.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je označený ako manuálne nainštalovaný.\n" @@ -593,8 +593,8 @@ msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tejto operácii sa na disku uvoľní %sB.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" @@ -604,15 +604,17 @@ msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatok voľného miesta." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -623,28 +625,28 @@ msgstr "" "Ak chcete pokračovať, opíšte frázu „%s“\n" " ?]" -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Prerušené." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime „iba stiahnuť“" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -652,19 +654,19 @@ msgstr "" "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --" "fix-missing" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Chýbajúce balíky sa nedajú opraviť." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Inštalácia sa prerušuje." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -681,35 +683,35 @@ msgstr[2] "" "Nasledovné balíky zmizli z vášho systému, pretože\n" "všetky súbory boli prepísané inými balíkmi:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Pozn.: Toto robí dpkg automaticky a zámerne." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorovať nedostupné cieľové vydanie „%s“ balíka „%s“" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -727,15 +729,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnútorná chyba, AutoRemover niečo pokazil" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -748,7 +750,7 @@ msgstr[1] "" msgstr[2] "" "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -760,22 +762,22 @@ msgstr[1] "" msgstr[2] "" "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Na jeho odstránenie použite „apt-get autoremove“." msgstr[1] "Na ich odstránenie použite „apt-get autoremove“." msgstr[2] "Na ich odstránenie použite „apt-get autoremove“." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -783,7 +785,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo " "navrhnite riešenie)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -795,33 +797,33 @@ msgstr "" "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Poškodené balíky" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s je označený ako automaticky nainštalovaný.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -829,46 +831,46 @@ msgstr "" "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark auto“ a " "„apt-mark manual“." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Sťahuje sa %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, 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:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -878,7 +880,7 @@ msgstr "" "adrese:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -890,70 +892,70 @@ msgstr "" "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie " "balíka.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor „%s“\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, 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:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz na zostavenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -962,17 +964,17 @@ msgstr "" "Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení " "nájdete v apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získať závislosti na zostavenie %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti na zostavenie.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -981,20 +983,20 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch " "„%s“" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1003,7 +1005,7 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, " "nedokáže splniť požiadavky na verziu" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1011,30 +1013,30 @@ msgid "" msgstr "" "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti na zostavenie %s nemožno splniť." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí na zostavenie zlyhalo" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Záznam zmien %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1122,7 +1124,7 @@ msgstr "" "a apt.conf(5).\n" " Tento APT má schopnosti posvätnej kravy.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1737,7 +1739,7 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Do %s sa nedá zapisovať" @@ -2774,7 +2776,7 @@ msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2783,12 +2785,12 @@ msgstr "" "Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v " "man 5 apt.conf pod APT::Immediate-Configure (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Nedá sa nakonfigurovať „%s“." -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2822,7 +2824,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2967,21 +2969,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Načítavajú sa zoznamy balíkov" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti" diff --git a/po/sl.po b/po/sl.po index b4b4e552a..a2ff51eb6 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr " Preglednica različic:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -481,7 +481,7 @@ msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n" msgid "%s is already the newest version.\n" msgstr "Najnovejša različica %s je že nameščena.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je bil nastavljen na ročno nameščen.\n" @@ -590,8 +590,8 @@ msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ni mogoče določiti prostega prostora v %s" @@ -601,15 +601,17 @@ msgstr "Ni mogoče določiti prostega prostora v %s" msgid "You don't have enough free space in %s." msgstr "Na %s je premalo prostora." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -620,28 +622,28 @@ msgstr "" "Za nadaljevanje vtipkajte frazo '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Prekini." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Ali želite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Prejem nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Prejem je dokončan in uporabljen je način samo prejema" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -649,19 +651,19 @@ msgstr "" "Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Ni mogoče popraviti manjkajočih paketov." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Prekinjanje namestitve." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -681,37 +683,37 @@ msgstr[3] "" "Naslednji paketi so izginili z vašega sistema, ker so vse\n" "datoteke prepisali drugi paketi:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Opomba: To je dpkg storil samodejno in namenoma." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Prezri nerazpoložljiv cilj izdaje '%s' paketa '%s'" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Prezri nerazpoložljivo različico '%s' paketa '%s'" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Ukaz update ne sprejema argumentov" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Program ne bi smel brisati stvari, ni mogoče zagnati " "SamodejnegaOdstranjevalnika" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -730,15 +732,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -750,7 +752,7 @@ msgstr[2] "" "Naslednja paketa sta bila samodejno nameščena in nista več zahtevana:" msgstr[3] "Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -760,7 +762,7 @@ msgstr[1] "%lu paket je bil samodejno nameščen in ni bil več zahtevan.\n" msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n" msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Uporabite 'apt-get autoremove' za njihovo odstranitev." @@ -768,15 +770,15 @@ msgstr[1] "Uporabite 'apt-get autoremove' za njegovo odstranitev." msgstr[2] "Uporabite 'apt-get autoremove' za njuno odstranitev." msgstr[3] "Uporabite 'apt-get autoremove' za njihovo odstranitev." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', če želite popraviti naslednje:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -784,7 +786,7 @@ msgstr "" "Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "navedite rešitev)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -796,33 +798,33 @@ msgstr "" ", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n" " iz Prihajajočega." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameščeni:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Priporočeni paketi:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoče najti paketa %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s je nastavljen na samodejno nameščen.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -830,47 +832,47 @@ msgstr "" "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark auto' in 'apt-mark " "manual'." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Preračunavanje nadgradnje ... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka, reševalnik težav je pokvaril stvari" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Ni mogoče zakleniti mape prejemov" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Prejemanje %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoče najti" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -879,7 +881,7 @@ msgstr "" "OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -890,70 +892,70 @@ msgstr "" "bzr branch %s\n" "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskok že prejete datoteke '%s'\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoče pridobiti." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Podrejeno opravilo ni uspelo" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -962,17 +964,17 @@ msgstr "" "Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte " "apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -980,20 +982,20 @@ msgid "" msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, 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:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1002,7 +1004,7 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s ne more zadostiti zahtev različice" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1011,30 +1013,30 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s nima različice kandidata" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo je spodletela" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Dnevnik sprememb za %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1121,7 +1123,7 @@ msgstr "" " sources.list(5) in apt.conf(5). \n" " Ta APT ima moči super krav.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1736,7 +1738,7 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoče pisati na %s" @@ -2779,7 +2781,7 @@ msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2788,12 +2790,12 @@ msgstr "" "Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod " "APT::Immediate-Configure za podrobnosti. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Ni mogoče nastaviti '%s' " -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2827,7 +2829,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2970,21 +2972,21 @@ msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT." msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoče najti med obdelavo odvisnosti datotek" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoče določiti seznama izvornih paketov %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Branje seznama paketov" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Napaka VI med shranjevanjem predpomnilnika virov" diff --git a/po/sv.po b/po/sv.po index ff85a8ba2..02bcf0c49 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr " Versionstabell:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -486,7 +486,7 @@ msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" msgid "%s is already the newest version.\n" msgstr "%s är redan den senaste versionen.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" @@ -596,8 +596,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" @@ -607,15 +607,17 @@ msgstr "Kunde inte fastställa ledigt utrymme i %s" msgid "You don't have enough free space in %s." msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Ja, gör som jag säger!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -627,28 +629,28 @@ msgstr "" " ?] " # Visas då man svarar nej -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Misslyckades med att hämta vissa filer" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -656,19 +658,19 @@ msgstr "" "Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --" "fix-missing." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stöds inte för tillfället" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Kunde inte korrigera saknade paket." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Avbryter installationen." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -682,36 +684,36 @@ msgstr[1] "" "Följande paket har försvunnit från ditt system eftersom\n" "alla filer har skrivits över av andra paket:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Observera: Detta sker med automatik och vid behov av dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignorera otillgängliga målutgåvan \"%s\" av paketet \"%s\"" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Väljer \"%s\" som källkodspaket istället för \"%s\"\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignorera otillgängliga versionen \"%s\" av paketet \"%s\"" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -729,15 +731,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Följande information kan vara till hjälp för att lösa situationen:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internt fel, AutoRemover förstörde något" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -748,7 +750,7 @@ msgstr[0] "" msgstr[1] "" "Följande paket har installerats automatiskt och är inte längre nödvändiga:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -758,22 +760,22 @@ msgstr[0] "" msgstr[1] "" "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Använd \"apt-get autoremove\" för att ta bort dem." msgstr[1] "Använd \"apt-get autoremove\" för att ta bort dem." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -781,7 +783,7 @@ msgstr "" "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket " "(eller ange en lösning)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -793,78 +795,78 @@ msgstr "" "att några nödvändiga paket ännu inte har skapats eller flyttats\n" "ut från \"Incoming\"." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Föreslagna paket:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s är satt till automatiskt installerad.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Färdig" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren förstörde någonting" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange minst ett paket att hämta källkod för" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, 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:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -874,7 +876,7 @@ msgstr "" "på:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, fuzzy, c-format msgid "" "Please use:\n" @@ -885,85 +887,85 @@ msgstr "" "bzr get %s\n" "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta information om byggberoenden för %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -972,7 +974,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -981,14 +983,14 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade " "paketet %s är för nytt" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -997,7 +999,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1006,31 +1008,31 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" # Felmeddelande för misslyckad chdir -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Ansluter till %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1118,7 +1120,7 @@ msgstr "" "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1729,7 +1731,7 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@ -2775,7 +2777,7 @@ msgstr "Rad %u i källistan %s har fel format (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2784,12 +2786,12 @@ msgstr "" "Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf " "under APT::Immediate-Configure för information. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2825,7 +2827,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2971,22 +2973,22 @@ msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera." msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketet %s %s hittades inte när filberoenden hanterades" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status på källkodspaketlistan %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Läser paketlistor" # Bättre ord? -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Samlar filtillhandahållningar" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" diff --git a/po/th.po b/po/th.po index 5badf49fb..9da100061 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -154,7 +154,7 @@ msgid " Version table:" msgstr " ตารางรุ่น:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -476,7 +476,7 @@ msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ msgid "%s is already the newest version.\n" msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" @@ -583,8 +583,8 @@ msgstr "หลังจากการกระทำนี้ ต้องใ msgid "After this operation, %sB disk space will be freed.\n" msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" @@ -594,15 +594,17 @@ msgstr "ไม่สามารถคำนวณพื้นที่ว่า msgid "You don't have enough free space in %s." msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -613,28 +615,28 @@ msgstr "" "หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "เลิกทำ" -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?" -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -642,19 +644,19 @@ msgstr "" "ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-" "missing อาจช่วยได้" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "จะล้มเลิกการติดตั้ง" -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -665,35 +667,35 @@ msgstr[0] "" "แพกเกจต่อไปนี้ได้หายไปจากระบบของคุณ เพราะแฟ้มทั้งหมดได้ถูกแทนที่\n" "โดยแพกเกจอื่นแล้ว:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "หมายเหตุ: นี่เป็นสิ่งที่ dpkg ทำโดยอัตโนมัติโดยเจตนา" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "จะละเลยรุ่นเป้าหมาย '%s' ซึ่งไม่มีอยู่ของแพกเกจ '%s'" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "จะเลือก '%s' เป็นแพกเกจซอร์สแทน '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "จะละเลยรุ่น '%s' ที่ไม่มีอยู่ของแพกเกจ '%s'" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -711,15 +713,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -727,27 +729,27 @@ msgid_plural "" "required:" msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "มีแพกเกจ %lu แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอนแพกเกจดังกล่าวได้" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -755,7 +757,7 @@ msgstr "" "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ " "(หรือจะระบุทางแก้ก็ได้)" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -766,78 +768,78 @@ msgstr "" "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n" "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "แพกเกจมีปัญหา" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "แพกเกจที่แนะนำ:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "แพกเกจที่ควรใช้ร่วมกัน:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบอัตโนมัติแล้ว\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark auto' และ 'apt-mark manual' แทน" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "กำลังคำนวณการปรับรุ่น... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "ล้มเหลว" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "เสร็จแล้ว" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "กำลังดาวน์โหลด %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -846,7 +848,7 @@ msgstr "" "ข้อสังเกต: การจัดทำแพกเกจ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -857,68 +859,68 @@ msgstr "" "bzr branch %s\n" "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -926,17 +928,17 @@ msgid "" msgstr "" "ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -944,19 +946,19 @@ msgid "" msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -965,37 +967,37 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "ปูมการแก้ไขสำหรับ %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1082,7 +1084,7 @@ msgstr "" "และ apt.conf(5)\n" " APT นี้มีพลังของ Super Cow\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1685,7 +1687,7 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" @@ -2711,7 +2713,7 @@ msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2720,12 +2722,12 @@ msgstr "" "ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ " "APT::Immediate-Configure (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "ไม่สามารถตั้งค่า '%s'" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2760,7 +2762,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2899,21 +2901,21 @@ msgstr "โอ้ คุณมาถึงขีดจำกัดจำนว msgid "Package %s %s was not found while processing file dependencies" msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "กำลังอ่านรายชื่อแพกเกจ" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" diff --git a/po/tl.po b/po/tl.po index f33d578a3..a92a8114e 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Talaang Bersyon:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -493,7 +493,7 @@ msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n" msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" @@ -607,8 +607,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" @@ -618,15 +618,17 @@ msgstr "Hindi matantsa ang libreng puwang sa %s" msgid "You don't have enough free space in %s." msgstr "Kulang kayo ng libreng puwang sa %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -637,28 +639,28 @@ msgstr "" "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -666,19 +668,19 @@ msgstr "" "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -688,35 +690,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -732,17 +734,17 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -752,7 +754,7 @@ msgid_plural "" msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -760,22 +762,22 @@ msgid_plural "" msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -783,7 +785,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -794,85 +796,85 @@ 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:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -880,85 +882,85 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -967,7 +969,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -976,14 +978,14 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -992,7 +994,7 @@ 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:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1001,30 +1003,30 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1109,7 +1111,7 @@ msgstr "" "para sa karagdagang impormasyon at mga option.\n" " Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1704,7 +1706,7 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Hindi makapagsulat sa %s" @@ -2753,19 +2755,19 @@ msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2803,7 +2805,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2952,21 +2954,21 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Binabasa ang Listahan ng mga Pakete" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Kinukuha ang Talaksang Provides" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" diff --git a/po/uk.po b/po/uk.po index 2714d23d5..4a1706204 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -163,7 +163,7 @@ msgid " Version table:" msgstr " Таблиця версій:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -491,7 +491,7 @@ msgstr "Перевстановлення %s неможливе, бо він не msgid "%s is already the newest version.\n" msgstr "Вже встановлена найновіша версія %s.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s позначений як встановлений вручну.\n" @@ -603,8 +603,8 @@ msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" @@ -614,16 +614,18 @@ msgstr "Не вдалося визначити кількість вільног msgid "You don't have enough free space in %s." msgstr "Недостатньо вільного місця в %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Вказано виконання тільки тривіальних операцій, але це не тривіальна операція." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Так, робити, як я скажу!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -634,28 +636,28 @@ msgstr "" "Щоб продовжити, введіть фразу: '%s'\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Перервано." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Бажаєте продовжити [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Деякі файли не вдалося завантажити" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Завантаження завершено в режимі \"тільки завантаження\"" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -663,19 +665,19 @@ msgstr "" "Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update " "або спробувати повторити запуск з ключем --fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing і зміна носія в даний момент не підтримується" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Неможливо виправити втрачені пакунки." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Переривається встановлення." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -692,35 +694,35 @@ msgstr[2] "" "Вказані пакунки зникли з вашої системи, так як\n" "усі файли були перезаписані іншими пакунками:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Увага: це зроблено автоматично і умисно dpkg'ем." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ігнорувати недоступний випуск '%s' пакунку '%s'" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Обираю '%s' як пакунок вихідних текстів, замість '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ігнорувати недоступну версію '%s' пакунку '%s'" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Команді update не потрібні аргументи" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Нам не дозволено видаляти, неможливо запустити AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -738,15 +740,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Наступна інформація можливо допоможе Вам виправити ситуацію:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутрішня Помилка, AutoRemover щось поламав" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -757,7 +759,7 @@ msgstr[0] "" msgstr[1] "Наступні пакунки були встановлені автоматично і більше не потрібні:" msgstr[2] "Наступні пакунки були встановлені автоматично і більше не потрібні:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -768,24 +770,24 @@ msgstr[1] "" msgstr[2] "" "%lu пакунків було встановлено автоматично і вони більше не потрібні.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Використовуйте 'apt-get autoremove' щоб видалити його." msgstr[1] "Використовуйте 'apt-get autoremove' щоб видалити їх." msgstr[2] "Використовуйте 'apt-get autoremove' щоб видалити їх." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутрішня помилка, AllUpgrade щось поламав" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f " "install':" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -793,7 +795,7 @@ msgstr "" "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " "вказуючи назв пакунків (або вкажіть рішення)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -804,33 +806,33 @@ msgstr "" "або ж використовуєте нестабільний дистрибутив, і запитані Вами пакунки\n" "ще не створені або були вилучені з Incoming." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Зламані пакунки" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Будуть встановлені наступні додаткові пакунки:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Пропоновані пакунки:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Рекомендовані пакунки:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s позначений як автоматично встановлений.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -838,48 +840,48 @@ msgstr "" "Ця команда застаріла. Будь-ласка, використовуйте замість неї 'apt-mark auto' " "і 'apt-mark manual'." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Обчислення оновлень... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Невдача" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Виконано" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Внутрішня помилка, вирішувач проблем щось поламав" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Неможливо заблокувати директорію для завантаження" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Завантаження %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -888,7 +890,7 @@ msgstr "" "УВАГА: Пакування '%s' відбувається в системі контролю версій '%s' на:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -899,71 +901,71 @@ msgstr "" "bzr branch %s\n" "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -972,17 +974,17 @@ msgstr "" "Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::" "Архітектури для налащтування" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -991,7 +993,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на " "'%s' пакунках" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -999,14 +1001,14 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s " "новіше, аніж треба" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1015,7 +1017,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо версія пакунку-" "кандидата %s не задовольняє умови по версіям" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1024,30 +1026,30 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо немає пакунку-" "кандидата %s потрібної версії" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал змін для %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1139,7 +1141,7 @@ msgstr "" "містять більше інформації і опцій.\n" " Цей APT має Супер-Коров'ячу Силу.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1761,7 +1763,7 @@ msgstr "" " -c=? Читати зазначений конфігураційний файл\n" " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Неможливо записати в %s" @@ -2823,7 +2825,7 @@ msgstr "Спотворений рядок %u у переліку джерел %s msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2832,12 +2834,12 @@ msgstr "" "Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 " "apt.conf, нижче APT::Immediate-Configure для деталей. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Неможливо налаштувати '%s'." -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2873,7 +2875,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3017,22 +3019,22 @@ msgstr "Ого! Ви перевищили кількість залежност msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакунок %s %s не був знайдений під час обробки залежностей" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Зчитування переліків пакунків" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 #, fuzzy msgid "Collecting File Provides" msgstr "Збирання інформації про 'File Provides'" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Помилка IO під час збереження кешу вихідних текстів" diff --git a/po/vi.po b/po/vi.po index 391efe621..fc79aa87a 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2012-11-20 14:12+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Bảng phiên bản:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -489,7 +489,7 @@ msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n" msgid "%s is already the newest version.\n" msgstr "%s là phiên bản mơi nhất.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s được đặt thành “được cài đặt bằng tay”.\n" @@ -599,8 +599,8 @@ msgstr "Sau thao tác này, %sB dung lượng đĩa thêm sẽ được dùng th msgid "After this operation, %sB disk space will be freed.\n" msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể tìm được chỗ trống trong %s" @@ -610,16 +610,18 @@ msgstr "Không thể tìm được chỗ trống trong %s" msgid "You don't have enough free space in %s." msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này đáng kể." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Có, làm đi!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -630,28 +632,28 @@ msgstr "" "Để tiếp tục thì gõ cụm từ “%s”\n" "?]" -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Hủy bỏ." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [C/k] " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc lấy %s bị lỗi %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -659,21 +661,21 @@ msgstr "" "Không thể lấy một số kho, có lẽ hãy chạy lệnh “apt-get update” (apt lấy cập " "nhật) hay cố với “--fix-missing” (sửa thiếu sót) không?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "Chưa hô trợ tùy chọn “--fix-missing” (sửa khi thiếu điều) và trao đổi phương " "tiện." -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Không thể sửa những gói còn thiếu." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Đang hủy bỏ tiến trình cài đặt." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -684,35 +686,35 @@ msgstr[0] "" "Những gói theo đây không còn nằm trên hệ thống này vì mọi tập tin đều bị gói " "khác ghi đè:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Ghi chú: thay đổi này được tự động thực hiệnbởi dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Bỏ qua bản phát hành đích không sẵn sàng “%s” của gói “%s”" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Đang chọn “%s” làm gói nguồn, thay cho “%s”\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Bỏ qua phiên bản không sẵn sàng “%s” của gói “%s”" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhận đối số" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 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" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -730,15 +732,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 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:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Lỗi nội bộ: Bộ Gỡ bỏ Tự động đã làm hư gì." -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -747,27 +749,27 @@ msgid_plural "" msgstr[0] "" "Gói nào theo đây đã được tự động cài đặt nên không còn cần thiết lại:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần thiết lại.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Hãy dùng lệnh `apt-get autoremove' để gỡ bỏ chúng." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 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:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -775,7 +777,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:1972 +#: cmdline/apt-get.cc:1974 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" @@ -787,33 +789,33 @@ 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:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Gói bị hỏng" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 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:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Các gói đề nghị:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Gói khuyến khích:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s được đặt thành “được tự động cài đặt”.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -821,46 +823,46 @@ msgstr "" "Lệnh này đã bị loại bỏ. Xin hãy dùng lệnh 'apt-mark auto' và 'apt-mark " "manual' để thay thế." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Đang tính bước nâng cấp... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Gặp lỗi" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Hoàn tất" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 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:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Không thể khoá thư mục tải về" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Không tìm thấy nguồn cho việc tải về phiên bản '%s' of '%s'" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Đang tải về %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "Phải ghi rõ ít nhất một gói cho đó cần lấy mã nguồn" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, 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:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -870,7 +872,7 @@ msgstr "" "“%s” tại:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -881,69 +883,69 @@ msgstr "" "bzr branch %s\n" "để lấy các gói mới nhất (có thể là chưa phát hành).\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, 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:2603 +#: cmdline/apt-get.cc:2605 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB từ kho nguồn.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Lấy nguồn %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Việc lấy một số kho bị lỗi." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dụng “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -952,17 +954,17 @@ msgstr "" "Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::" "Architectures để cài đặt" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, 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:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -970,20 +972,20 @@ msgid "" msgstr "" "phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên gói '%s'" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, 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:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -992,7 +994,7 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s " "có thể thỏa mãn điều kiện phiên bản" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1001,30 +1003,30 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản " "ứng cử" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, 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:3138 +#: cmdline/apt-get.cc:3140 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:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog cho %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Mô-đun đã hỗ trợ:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1117,7 +1119,7 @@ msgstr "" " apt-get(8), sources.list(5) và apt.conf(5).\n" " Trình APT này có năng lực của siêu bò.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1742,7 +1744,7 @@ msgstr "" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Không thể ghi vào %s" @@ -2810,7 +2812,7 @@ msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)." msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2819,12 +2821,12 @@ msgstr "" "Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." "conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Không thể cấu hình '%s'. " -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2859,7 +2861,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3005,21 +3007,21 @@ msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT nà msgid "Package %s %s was not found while processing file dependencies" msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Đang đọc các danh sách gói" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Đang tập hợp các Nhà cung cấp Tập tin" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" diff --git a/po/zh_CN.po b/po/zh_CN.po index 59f51dd87..8c3120001 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -155,7 +155,7 @@ msgid " Version table:" msgstr " 版本列表：" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -482,7 +482,7 @@ msgstr "不能重新安装 %s，因为无法下载它。\n" msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" @@ -589,8 +589,8 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" @@ -600,15 +600,17 @@ msgstr "无法获知您在 %s 上的可用空间" msgid "You don't have enough free space in %s." msgstr "您在 %s 上没有足够的可用空间。" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "是，按我说的做！" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -619,28 +621,28 @@ msgstr "" "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -648,19 +650,19 @@ msgstr "" "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "中止安装。" -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -669,35 +671,35 @@ msgid_plural "" "all files have been overwritten by other packages:" msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失：" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意：这是自动被 dpkg 有意完成的。" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "选择 %s 作为源代码包而非 %s\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "忽略不可用的 %2$s 软件包的 %1$s 版" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr " update 命令不需要参数" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -713,15 +715,15 @@ msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请 #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动卸载工具坏事了" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -729,28 +731,28 @@ msgid_plural "" "required:" msgstr[0] "下列软件包是自动安装的并且现在不需要了：" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 #, fuzzy msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "使用'apt-get autoremove'来卸载它们" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，全部升级工具坏事了" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -758,7 +760,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -769,78 +771,78 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "破损的软件包" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决工具坏事了" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -849,7 +851,7 @@ msgstr "" "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, fuzzy, c-format msgid "" "Please use:\n" @@ -860,104 +862,104 @@ msgstr "" "bzr get %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, 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:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -966,37 +968,37 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 " "%1$s 依赖关系" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "正在连接 %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1084,7 +1086,7 @@ msgstr "" "以获取更多信息和选项。\n" " 本 APT 具有超级牛力。\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1670,7 +1672,7 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" @@ -2701,7 +2703,7 @@ msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2710,12 +2712,12 @@ msgstr "" "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure " "(%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "无法打开文件 %s" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2751,7 +2753,7 @@ msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -2892,21 +2894,21 @@ msgstr "哇，依赖关系数量超出了本 APT 的处理能力。" msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "正在读取软件包列表" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "无法读取或写入软件源缓存" diff --git a/po/zh_TW.po b/po/zh_TW.po index d121e965f..4a8d6b9e8 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-14 08:05+0100\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] > testaptgetupdate.diff >> testaptgetupdate.diff || true - sed -i -e '/^Fetched / d' -e '/Ign / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff + sed -i -e '/^Fetched / d' -e '/Ign / d' -e '/Release/ d' -e 's#Get:[0-9]\+ #Get: #' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff GIVEN="$1" shift msgtest "Test for correctness of" "apt-get update with $*" @@ -81,22 +81,18 @@ testoverfile() { setupcompressor "$1" createemptyfile 'en' - testaptgetupdate "Get:1 file: InRelease [] -Reading package lists..." "empty file en.$COMPRESS over file" + testaptgetupdate 'Reading package lists...' "empty file en.$COMPRESS over file" createemptyarchive 'en' - testaptgetupdate "Get:1 file: InRelease [] -Reading package lists..." "empty archive en.$COMPRESS over file" + testaptgetupdate 'Reading package lists...' "empty archive en.$COMPRESS over file" createemptyarchive 'Packages' # FIXME: Why omits the file transport the Packages Get line? #Get:3 file: Packages [] - testaptgetupdate "Get:1 file: InRelease [] -Reading package lists..." "empty archive Packages.$COMPRESS over file" + testaptgetupdate 'Reading package lists...' "empty archive Packages.$COMPRESS over file" createemptyfile 'Packages' - testaptgetupdate "Get:1 file: InRelease [] -Err file: Packages + testaptgetupdate "Err file: Packages Empty files can't be valid archives W: Failed to fetch ${COMPRESSOR}:$(readlink -f aptarchive/Packages.$COMPRESS) Empty files can't be valid archives @@ -107,26 +103,22 @@ testoverhttp() { setupcompressor "$1" createemptyfile 'en' - testaptgetupdate "Get:1 http://localhost InRelease [] -Get:2 http://localhost Packages [] -Get:3 http://localhost Translation-en + testaptgetupdate "Get: http://localhost Packages [] +Get: http://localhost Translation-en Reading package lists..." "empty file en.$COMPRESS over http" createemptyarchive 'en' - testaptgetupdate "Get:1 http://localhost InRelease [] -Get:2 http://localhost Packages [] -Get:3 http://localhost Translation-en [] + testaptgetupdate "Get: http://localhost Packages [] +Get: http://localhost Translation-en [] Reading package lists..." "empty archive en.$COMPRESS over http" createemptyarchive 'Packages' - testaptgetupdate "Get:1 http://localhost InRelease [] -Get:2 http://localhost Packages [] + testaptgetupdate "Get: http://localhost Packages [] Reading package lists..." "empty archive Packages.$COMPRESS over http" createemptyfile 'Packages' #FIXME: we should response with a good error message instead - testaptgetupdate "Get:1 http://localhost InRelease [] -Get:2 http://localhost Packages + testaptgetupdate "Get: http://localhost Packages Err http://localhost Packages Empty files can't be valid archives W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages) Empty files can't be valid archives diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index d3ea91de5..01fb2e529 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -184,5 +184,5 @@ runtest2 DELETEFILE="InRelease" runtest -DELETEFILE="Release.gpg" -runtest +#DELETEFILE="Release.gpg" +#runtest -- cgit v1.2.3 From 2f5b615169aef2d9c74bb337af229dee2dce595e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 15 Mar 2013 14:17:01 +0100 Subject: * apt-pkg/indexcopy.cc: - rename RunGPGV to ExecGPGV and move it to apt-pkg/contrib/gpgv.cc --- apt-pkg/contrib/gpgv.cc | 138 ++++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/contrib/gpgv.h | 24 +++++++++ apt-pkg/indexcopy.cc | 122 +----------------------------------------- apt-pkg/indexcopy.h | 15 +++--- apt-pkg/makefile | 14 +++-- debian/changelog | 8 +++ methods/gpgv.cc | 3 +- 7 files changed, 189 insertions(+), 135 deletions(-) create mode 100644 apt-pkg/contrib/gpgv.cc create mode 100644 apt-pkg/contrib/gpgv.h diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc new file mode 100644 index 000000000..9b008dd4f --- /dev/null +++ b/apt-pkg/contrib/gpgv.cc @@ -0,0 +1,138 @@ +// -*- mode: cpp; mode: fold -*- +// Include Files /*{{{*/ +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + /*}}}*/ + +using namespace std; + +// RunGPGV - returns the command needed for verify /*{{{*/ +// --------------------------------------------------------------------- +/* Generating the commandline for calling gpgv is somehow complicated as + we need to add multiple keyrings and user supplied options. */ +bool ExecGPGV(std::string const &File, std::string const &FileGPG, + int const &statusfd, int fd[2]) +{ + if (File == FileGPG) + { + #define SIGMSG "-----BEGIN PGP SIGNED MESSAGE-----\n" + char buffer[sizeof(SIGMSG)]; + FILE* gpg = fopen(File.c_str(), "r"); + if (gpg == NULL) + return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str()); + char const * const test = fgets(buffer, sizeof(buffer), gpg); + fclose(gpg); + if (test == NULL || strcmp(buffer, SIGMSG) != 0) + return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str()); + #undef SIGMSG + } + + + string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); + // FIXME: remove support for deprecated APT::GPGV setting + string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted")); + string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts"); + + bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); + + if (Debug == true) + { + std::clog << "gpgv path: " << gpgvpath << std::endl; + std::clog << "Keyring file: " << trustedFile << std::endl; + std::clog << "Keyring path: " << trustedPath << std::endl; + } + + std::vector keyrings; + if (DirectoryExists(trustedPath)) + keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true); + if (RealFileExists(trustedFile) == true) + keyrings.push_back(trustedFile); + + std::vector Args; + Args.reserve(30); + + if (keyrings.empty() == true) + { + // TRANSLATOR: %s is the trusted keyring parts directory + return _error->Error(_("No keyring installed in %s."), + _config->FindDir("Dir::Etc::TrustedParts").c_str()); + } + + Args.push_back(gpgvpath.c_str()); + Args.push_back("--ignore-time-conflict"); + + if (statusfd != -1) + { + Args.push_back("--status-fd"); + char fd[10]; + snprintf(fd, sizeof(fd), "%i", statusfd); + Args.push_back(fd); + } + + for (vector::const_iterator K = keyrings.begin(); + K != keyrings.end(); ++K) + { + Args.push_back("--keyring"); + Args.push_back(K->c_str()); + } + + Configuration::Item const *Opts; + Opts = _config->Tree("Acquire::gpgv::Options"); + if (Opts != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + Args.push_back(Opts->Value.c_str()); + } + } + + Args.push_back(FileGPG.c_str()); + if (FileGPG != File) + Args.push_back(File.c_str()); + Args.push_back(NULL); + + if (Debug == true) + { + std::clog << "Preparing to exec: " << gpgvpath; + for (std::vector::const_iterator a = Args.begin(); *a != NULL; ++a) + std::clog << " " << *a; + std::clog << std::endl; + } + + if (statusfd != -1) + { + int const nullfd = open("/dev/null", O_RDONLY); + close(fd[0]); + // Redirect output to /dev/null; we read from the status fd + dup2(nullfd, STDOUT_FILENO); + dup2(nullfd, STDERR_FILENO); + // Redirect the pipe to the status fd (3) + dup2(fd[1], statusfd); + + putenv((char *)"LANG="); + putenv((char *)"LC_ALL="); + putenv((char *)"LC_MESSAGES="); + } + + execvp(gpgvpath.c_str(), (char **) &Args[0]); + return true; +} + /*}}}*/ diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h new file mode 100644 index 000000000..c15166c94 --- /dev/null +++ b/apt-pkg/contrib/gpgv.h @@ -0,0 +1,24 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Helpers to deal with gpgv better and more easily + + ##################################################################### */ + /*}}}*/ +#ifndef CONTRIB_GPGV_H +#define CONTRIB_GPGV_H + +#include + +/** \brief generates and run the command to verify a file with gpgv */ +bool ExecGPGV(std::string const &File, std::string const &FileOut, + int const &statusfd, int fd[2]); + +inline bool ExecGPGV(std::string const &File, std::string const &FileOut, + int const &statusfd = -1) { + int fd[2]; + return ExecGPGV(File, FileOut, statusfd, fd); +} + +#endif diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index aa1f01a4a..f53989bdb 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -593,9 +593,9 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, if(pid == 0) { if (useInRelease == true) - RunGPGV(inrelease, inrelease); + ExecGPGV(inrelease, inrelease); else - RunGPGV(release, releasegpg); + ExecGPGV(release, releasegpg); } if(!ExecWait(pid, "gpgv")) { @@ -639,124 +639,6 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, } } - return true; -} - /*}}}*/ -// SigVerify::RunGPGV - returns the command needed for verify /*{{{*/ -// --------------------------------------------------------------------- -/* Generating the commandline for calling gpgv is somehow complicated as - we need to add multiple keyrings and user supplied options. Also, as - the cdrom code currently can not use the gpgv method we have two places - these need to be done - so the place for this method is wrong but better - than code duplication… */ -bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG, - int const &statusfd, int fd[2]) -{ - if (File == FileGPG) - { - #define SIGMSG "-----BEGIN PGP SIGNED MESSAGE-----\n" - char buffer[sizeof(SIGMSG)]; - FILE* gpg = fopen(File.c_str(), "r"); - if (gpg == NULL) - return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str()); - char const * const test = fgets(buffer, sizeof(buffer), gpg); - fclose(gpg); - if (test == NULL || strcmp(buffer, SIGMSG) != 0) - return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str()); - #undef SIGMSG - } - - - string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - // FIXME: remove support for deprecated APT::GPGV setting - string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted")); - string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts"); - - bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); - - if (Debug == true) - { - std::clog << "gpgv path: " << gpgvpath << std::endl; - std::clog << "Keyring file: " << trustedFile << std::endl; - std::clog << "Keyring path: " << trustedPath << std::endl; - } - - std::vector keyrings; - if (DirectoryExists(trustedPath)) - keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true); - if (RealFileExists(trustedFile) == true) - keyrings.push_back(trustedFile); - - std::vector Args; - Args.reserve(30); - - if (keyrings.empty() == true) - { - // TRANSLATOR: %s is the trusted keyring parts directory - return _error->Error(_("No keyring installed in %s."), - _config->FindDir("Dir::Etc::TrustedParts").c_str()); - } - - Args.push_back(gpgvpath.c_str()); - Args.push_back("--ignore-time-conflict"); - - if (statusfd != -1) - { - Args.push_back("--status-fd"); - char fd[10]; - snprintf(fd, sizeof(fd), "%i", statusfd); - Args.push_back(fd); - } - - for (vector::const_iterator K = keyrings.begin(); - K != keyrings.end(); ++K) - { - Args.push_back("--keyring"); - Args.push_back(K->c_str()); - } - - Configuration::Item const *Opts; - Opts = _config->Tree("Acquire::gpgv::Options"); - if (Opts != 0) - { - Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) - { - if (Opts->Value.empty() == true) - continue; - Args.push_back(Opts->Value.c_str()); - } - } - - Args.push_back(FileGPG.c_str()); - if (FileGPG != File) - Args.push_back(File.c_str()); - Args.push_back(NULL); - - if (Debug == true) - { - std::clog << "Preparing to exec: " << gpgvpath; - for (std::vector::const_iterator a = Args.begin(); *a != NULL; ++a) - std::clog << " " << *a; - std::clog << std::endl; - } - - if (statusfd != -1) - { - int const nullfd = open("/dev/null", O_RDONLY); - close(fd[0]); - // Redirect output to /dev/null; we read from the status fd - dup2(nullfd, STDOUT_FILENO); - dup2(nullfd, STDERR_FILENO); - // Redirect the pipe to the status fd (3) - dup2(fd[1], statusfd); - - putenv((char *)"LANG="); - putenv((char *)"LC_ALL="); - putenv((char *)"LC_MESSAGES="); - } - - execvp(gpgvpath.c_str(), (char **) &Args[0]); return true; } /*}}}*/ diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index e3de1afd9..49e724f2f 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -14,6 +14,9 @@ #include #include +#include +#include + #ifndef APT_8_CLEANER_HEADERS using std::string; using std::vector; @@ -96,13 +99,13 @@ class SigVerify /*{{{*/ bool CopyAndVerify(std::string CDROM,std::string Name,std::vector &SigList, std::vector PkgList,std::vector SrcList); - /** \brief generates and run the command to verify a file with gpgv */ - static bool RunGPGV(std::string const &File, std::string const &FileOut, - int const &statusfd, int fd[2]); - inline static bool RunGPGV(std::string const &File, std::string const &FileOut, + __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut, + int const &statusfd, int fd[2]) { + return ExecGPGV(File, FileOut, statusfd, fd); + }; + __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut, int const &statusfd = -1) { - int fd[2]; - return RunGPGV(File, FileOut, statusfd, fd); + return ExecGPGV(File, FileOut, statusfd); }; }; /*}}}*/ diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 27d7ead24..59729faf5 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -27,15 +27,13 @@ APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR) SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \ contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \ contrib/hashsum.cc contrib/md5.cc contrib/sha1.cc \ - contrib/sha2_internal.cc\ - contrib/hashes.cc \ + contrib/sha2_internal.cc contrib/hashes.cc \ contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \ - contrib/fileutl.cc -HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h netrc.h\ - md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha2.h sha256.h\ - sha2_internal.h \ - hashes.h hashsum_template.h\ - macros.h weakptr.h + contrib/fileutl.cc contrib/gpgv.cc +HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h netrc.h \ + md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha2.h sha256.h \ + sha2_internal.h hashes.h hashsum_template.h \ + macros.h weakptr.h gpgv.h # Source code for the core main library SOURCE+= pkgcache.cc version.cc depcache.cc \ diff --git a/debian/changelog b/debian/changelog index 9ed9b4d61..ac630ad7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.7.9) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/indexcopy.cc: + - rename RunGPGV to ExecGPGV and move it to apt-pkg/contrib/gpgv.cc + + -- David Kalnischkies Fri, 15 Mar 2013 14:15:43 +0100 + apt (0.9.7.8) unstable; urgency=criticial * SECURITY UPDATE: InRelease verification bypass diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 25ba0d063..98381b845 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -72,7 +73,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, else if (pid == 0) { _error->PushToStack(); - bool const success = SigVerify::RunGPGV(outfile, file, 3, fd); + bool const success = ExecGPGV(outfile, file, 3, fd); if (success == false) { string errmsg; -- cgit v1.2.3 From 99ed26d32226f0dffe5a37fb78c5588f9d9ecfd5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 15 Mar 2013 14:29:46 +0100 Subject: * apt-pkg/contrib/gpgv.cc: - ExecGPGV is a method which should never return, so mark it as such and fix the inconsistency of returning in error cases --- apt-pkg/contrib/gpgv.cc | 22 ++++++++++++++++------ apt-pkg/contrib/gpgv.h | 26 ++++++++++++++++++++------ apt-pkg/indexcopy.h | 6 ++++-- debian/changelog | 3 +++ methods/gpgv.cc | 14 +------------- 5 files changed, 44 insertions(+), 27 deletions(-) diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 9b008dd4f..9760bd21f 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -25,20 +25,28 @@ using namespace std; // --------------------------------------------------------------------- /* Generating the commandline for calling gpgv is somehow complicated as we need to add multiple keyrings and user supplied options. */ -bool ExecGPGV(std::string const &File, std::string const &FileGPG, +void ExecGPGV(std::string const &File, std::string const &FileGPG, int const &statusfd, int fd[2]) { + #define EINTERNAL 111 + if (File == FileGPG) { #define SIGMSG "-----BEGIN PGP SIGNED MESSAGE-----\n" char buffer[sizeof(SIGMSG)]; FILE* gpg = fopen(File.c_str(), "r"); if (gpg == NULL) - return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str()); + { + ioprintf(std::cerr, _("Could not open file %s"), File.c_str()); + exit(EINTERNAL); + } char const * const test = fgets(buffer, sizeof(buffer), gpg); fclose(gpg); if (test == NULL || strcmp(buffer, SIGMSG) != 0) - return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str()); + { + ioprintf(std::cerr, _("File %s doesn't start with a clearsigned message"), File.c_str()); + exit(EINTERNAL); + } #undef SIGMSG } @@ -69,8 +77,9 @@ bool ExecGPGV(std::string const &File, std::string const &FileGPG, if (keyrings.empty() == true) { // TRANSLATOR: %s is the trusted keyring parts directory - return _error->Error(_("No keyring installed in %s."), - _config->FindDir("Dir::Etc::TrustedParts").c_str()); + ioprintf(std::cerr, _("No keyring installed in %s."), + _config->FindDir("Dir::Etc::TrustedParts").c_str()); + exit(EINTERNAL); } Args.push_back(gpgvpath.c_str()); @@ -133,6 +142,7 @@ bool ExecGPGV(std::string const &File, std::string const &FileGPG, } execvp(gpgvpath.c_str(), (char **) &Args[0]); - return true; + ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str()); + exit(EINTERNAL); } /*}}}*/ diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index c15166c94..8aeea2fb3 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -11,14 +11,28 @@ #include -/** \brief generates and run the command to verify a file with gpgv */ -bool ExecGPGV(std::string const &File, std::string const &FileOut, - int const &statusfd, int fd[2]); +#if __GNUC__ >= 4 + #define APT_noreturn __attribute__ ((noreturn)) +#else + #define APT_noreturn /* no support */ +#endif -inline bool ExecGPGV(std::string const &File, std::string const &FileOut, +/** \brief generates and run the command to verify a file with gpgv + * + * If File and FileSig specify the same file it is assumed that we + * deal with a clear-signed message. + * + * @param File is the message (unsigned or clear-signed) + * @param FileSig is the signature (detached or clear-signed) + */ +void ExecGPGV(std::string const &File, std::string const &FileSig, + int const &statusfd, int fd[2]) APT_noreturn; +inline void ExecGPGV(std::string const &File, std::string const &FileSig, int const &statusfd = -1) { int fd[2]; - return ExecGPGV(File, FileOut, statusfd, fd); -} + ExecGPGV(File, FileSig, statusfd, fd); +}; + +#undef APT_noreturn #endif diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index 49e724f2f..aa221158e 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -101,11 +101,13 @@ class SigVerify /*{{{*/ __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut, int const &statusfd, int fd[2]) { - return ExecGPGV(File, FileOut, statusfd, fd); + ExecGPGV(File, FileOut, statusfd, fd); + return false; }; __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut, int const &statusfd = -1) { - return ExecGPGV(File, FileOut, statusfd); + ExecGPGV(File, FileOut, statusfd); + return false; }; }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index ac630ad7e..bd4116406 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.9.7.9) UNRELEASED; urgency=low [ David Kalnischkies ] * apt-pkg/indexcopy.cc: - rename RunGPGV to ExecGPGV and move it to apt-pkg/contrib/gpgv.cc + * apt-pkg/contrib/gpgv.cc: + - ExecGPGV is a method which should never return, so mark it as such + and fix the inconsistency of returning in error cases -- David Kalnischkies Fri, 15 Mar 2013 14:15:43 +0100 diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 98381b845..3f814b9f0 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -71,19 +71,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, if (pid < 0) return string("Couldn't spawn new process") + strerror(errno); else if (pid == 0) - { - _error->PushToStack(); - bool const success = ExecGPGV(outfile, file, 3, fd); - if (success == false) - { - string errmsg; - _error->PopMessage(errmsg); - _error->RevertToStack(); - return errmsg; - } - _error->RevertToStack(); - exit(111); - } + ExecGPGV(outfile, file, 3, fd); close(fd[1]); FILE *pipein = fdopen(fd[0], "r"); -- cgit v1.2.3 From b38bb727530a7e836689ef100b07926522066986 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 15 Mar 2013 14:49:05 +0100 Subject: don't close stdout/stderr if it is also the statusfd --- apt-pkg/contrib/gpgv.cc | 21 +++++++++++---------- debian/changelog | 1 + 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 9760bd21f..94a1f8778 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -2,14 +2,13 @@ // Include Files /*{{{*/ #include -#include -#include -#include +#include +#include #include #include #include -#include -#include + +#include #include #include @@ -85,12 +84,12 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, Args.push_back(gpgvpath.c_str()); Args.push_back("--ignore-time-conflict"); + char statusfdstr[10]; if (statusfd != -1) { Args.push_back("--status-fd"); - char fd[10]; - snprintf(fd, sizeof(fd), "%i", statusfd); - Args.push_back(fd); + snprintf(statusfdstr, sizeof(fd), "%i", statusfd); + Args.push_back(statusfdstr); } for (vector::const_iterator K = keyrings.begin(); @@ -131,8 +130,10 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, int const nullfd = open("/dev/null", O_RDONLY); close(fd[0]); // Redirect output to /dev/null; we read from the status fd - dup2(nullfd, STDOUT_FILENO); - dup2(nullfd, STDERR_FILENO); + if (statusfd != STDOUT_FILENO) + dup2(nullfd, STDOUT_FILENO); + if (statusfd != STDERR_FILENO) + dup2(nullfd, STDERR_FILENO); // Redirect the pipe to the status fd (3) dup2(fd[1], statusfd); diff --git a/debian/changelog b/debian/changelog index bd4116406..0423cefa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ apt (0.9.7.9) UNRELEASED; urgency=low * apt-pkg/contrib/gpgv.cc: - ExecGPGV is a method which should never return, so mark it as such and fix the inconsistency of returning in error cases + - don't close stdout/stderr if it is also the statusfd -- David Kalnischkies Fri, 15 Mar 2013 14:15:43 +0100 -- cgit v1.2.3 From 39f38a81b85edf2e1bdc4e92267a63cc6c928734 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 15 Mar 2013 14:55:43 +0100 Subject: * apt-pkg/acquire-item.cc: - keep the last good InRelease file around just as we do it with Release.gpg in case the new one we download isn't good for us --- apt-pkg/acquire-item.cc | 26 ++++++++++++++++---------- debian/changelog | 3 +++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index a30e98858..39b842dfb 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1503,20 +1503,17 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) if (AuthPass == true) { // gpgv method failed, if we have a good signature - string LastGoodSigFile = _config->FindDir("Dir::State::lists"); - if (DestFile == SigFile) - LastGoodSigFile.append(URItoFileName(RealURI)); - else - LastGoodSigFile.append("partial/").append(URItoFileName(RealURI)).append(".gpg.reverify"); + string LastGoodSigFile = _config->FindDir("Dir::State::lists").append("partial/").append(URItoFileName(RealURI)); + if (DestFile != SigFile) + LastGoodSigFile.append(".gpg"); + LastGoodSigFile.append(".reverify"); if(FileExists(LastGoodSigFile)) { + string VerifiedSigFile = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); if (DestFile != SigFile) - { - string VerifiedSigFile = _config->FindDir("Dir::State::lists") + - URItoFileName(RealURI) + ".gpg"; - Rename(LastGoodSigFile,VerifiedSigFile); - } + VerifiedSigFile.append(".gpg"); + Rename(LastGoodSigFile, VerifiedSigFile); Status = StatTransientNetworkError; _error->Warning(_("A error occurred during the signature " "verification. The repository is not updated " @@ -1577,6 +1574,15 @@ pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire *Owner, /*{{{*/ MetaSigURI(MetaSigURI), MetaSigURIDesc(MetaSigURIDesc), MetaSigShortDesc(MetaSigShortDesc) { SigFile = DestFile; + + // keep the old InRelease around in case of transistent network errors + string const Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); + struct stat Buf; + if (stat(Final.c_str(),&Buf) == 0) + { + string const LastGoodSig = DestFile + ".reverify"; + Rename(Final,LastGoodSig); + } } /*}}}*/ // pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 0423cefa6..77e8674a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ apt (0.9.7.9) UNRELEASED; urgency=low - ExecGPGV is a method which should never return, so mark it as such and fix the inconsistency of returning in error cases - don't close stdout/stderr if it is also the statusfd + * apt-pkg/acquire-item.cc: + - keep the last good InRelease file around just as we do it with + Release.gpg in case the new one we download isn't good for us -- David Kalnischkies Fri, 15 Mar 2013 14:15:43 +0100 -- cgit v1.2.3 From 4fb400a66f2436cba6c89cecdc9560c9b1c54337 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 15 Mar 2013 14:57:27 +0100 Subject: split out a method to strip whitespaces only on the right side --- apt-pkg/contrib/strutl.cc | 8 +++++++- apt-pkg/contrib/strutl.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index ca096d736..9726138a0 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -117,7 +117,13 @@ char *_strstrip(char *String) if (*String == 0) return String; - + return _strrstrip(String); +} + /*}}}*/ +// strrstrip - Remove white space from the back of a string /*{{{*/ +// --------------------------------------------------------------------- +char *_strrstrip(char *String) +{ char *End = String + strlen(String) - 1; for (;End != String - 1 && (*End == ' ' || *End == '\t' || *End == '\n' || *End == '\r'); End--); diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 337139d5d..e92f91dc0 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -35,6 +35,7 @@ using std::ostream; bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest); char *_strstrip(char *String); +char *_strrstrip(char *String); // right strip only char *_strtabexpand(char *String,size_t Len); bool ParseQuoteWord(const char *&String,std::string &Res); bool ParseCWord(const char *&String,std::string &Res); -- cgit v1.2.3 From 2d3fe9cfadb33556b7563a98bb5a4698888e6c40 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 15 Mar 2013 18:53:53 +0100 Subject: - if ExecGPGV deals with a clear-signed file it will split this file into data and signatures, pass it to gpgv for verification and recombines it after that in a known-good way without unsigned blocks and whitespaces resulting usually in more or less the same file as before, but later code can be sure about the format * apt-pkg/deb/debmetaindex.cc: - reenable InRelease by default --- apt-pkg/contrib/gpgv.cc | 302 ++++++++++++++++++--- apt-pkg/contrib/gpgv.h | 41 ++- apt-pkg/deb/debmetaindex.cc | 31 ++- debian/changelog | 7 + ...st-ubuntu-bug-784473-InRelease-one-message-only | 14 +- 5 files changed, 337 insertions(+), 58 deletions(-) diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 94a1f8778..c236a7289 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -2,58 +2,54 @@ // Include Files /*{{{*/ #include +#include #include +#include #include +#include #include #include -#include - -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include /*}}}*/ +char * GenerateTemporaryFileTemplate(const char *basename) /*{{{*/ +{ + const char *tmpdir = getenv("TMPDIR"); +#ifdef P_tmpdir + if (!tmpdir) + tmpdir = P_tmpdir; +#endif + if (!tmpdir) + tmpdir = "/tmp"; -using namespace std; - -// RunGPGV - returns the command needed for verify /*{{{*/ + std::string out; + strprintf(out, "%s/%s.XXXXXX", tmpdir, basename); + return strdup(out.c_str()); +} + /*}}}*/ +// ExecGPGV - returns the command needed for verify /*{{{*/ // --------------------------------------------------------------------- /* Generating the commandline for calling gpgv is somehow complicated as - we need to add multiple keyrings and user supplied options. */ + we need to add multiple keyrings and user supplied options. + Also, as gpgv has no options to enforce a certain reduced style of + clear-signed files (=the complete content of the file is signed and + the content isn't encoded) we do a divide and conquer approach here +*/ void ExecGPGV(std::string const &File, std::string const &FileGPG, - int const &statusfd, int fd[2]) + int const &statusfd, int fd[2]) { #define EINTERNAL 111 - - if (File == FileGPG) - { - #define SIGMSG "-----BEGIN PGP SIGNED MESSAGE-----\n" - char buffer[sizeof(SIGMSG)]; - FILE* gpg = fopen(File.c_str(), "r"); - if (gpg == NULL) - { - ioprintf(std::cerr, _("Could not open file %s"), File.c_str()); - exit(EINTERNAL); - } - char const * const test = fgets(buffer, sizeof(buffer), gpg); - fclose(gpg); - if (test == NULL || strcmp(buffer, SIGMSG) != 0) - { - ioprintf(std::cerr, _("File %s doesn't start with a clearsigned message"), File.c_str()); - exit(EINTERNAL); - } - #undef SIGMSG - } - - - string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); + std::string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); // FIXME: remove support for deprecated APT::GPGV setting - string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted")); - string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts"); + std::string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted")); + std::string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts"); bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); @@ -64,7 +60,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, std::clog << "Keyring path: " << trustedPath << std::endl; } - std::vector keyrings; + std::vector keyrings; if (DirectoryExists(trustedPath)) keyrings = GetListOfFilesInDir(trustedPath, "gpg", false, true); if (RealFileExists(trustedFile) == true) @@ -88,11 +84,11 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, if (statusfd != -1) { Args.push_back("--status-fd"); - snprintf(statusfdstr, sizeof(fd), "%i", statusfd); + snprintf(statusfdstr, sizeof(statusfdstr), "%i", statusfd); Args.push_back(statusfdstr); } - for (vector::const_iterator K = keyrings.begin(); + for (std::vector::const_iterator K = keyrings.begin(); K != keyrings.end(); ++K) { Args.push_back("--keyring"); @@ -112,9 +108,49 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, } } - Args.push_back(FileGPG.c_str()); + int sigFd = -1; + int dataFd = -1; + std::vector dataHeader; + char * sig = NULL; + char * data = NULL; + + // file with detached signature if (FileGPG != File) + { + Args.push_back(FileGPG.c_str()); Args.push_back(File.c_str()); + } + else // clear-signed file + { + sig = GenerateTemporaryFileTemplate("apt.sig"); + data = GenerateTemporaryFileTemplate("apt.data"); + if (sig == NULL || data == NULL) + { + ioprintf(std::cerr, "Couldn't create tempfiles for splitting up %s", File.c_str()); + exit(EINTERNAL); + } + + sigFd = mkstemp(sig); + dataFd = mkstemp(data); + int const duppedSigFd = dup(sigFd); + int const duppedDataFd = dup(dataFd); + + if (dataFd == -1 || sigFd == -1 || duppedDataFd == -1 || duppedSigFd == -1 || + SplitClearSignedFile(File, duppedDataFd, &dataHeader, duppedSigFd) == false) + { + if (dataFd != -1) + unlink(sig); + if (sigFd != -1) + unlink(data); + ioprintf(std::cerr, "Splitting up %s into data and signature failed", File.c_str()); + exit(EINTERNAL); + } + lseek(dataFd, 0, SEEK_SET); + lseek(sigFd, 0, SEEK_SET); + Args.push_back(sig); + Args.push_back(data); + } + Args.push_back(NULL); if (Debug == true) @@ -142,8 +178,186 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, putenv((char *)"LC_MESSAGES="); } - execvp(gpgvpath.c_str(), (char **) &Args[0]); - ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str()); - exit(EINTERNAL); + if (FileGPG != File) + { + execvp(gpgvpath.c_str(), (char **) &Args[0]); + ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str()); + exit(EINTERNAL); + } + else + { +//#define UNLINK_EXIT(X) exit(X) +#define UNLINK_EXIT(X) unlink(sig);unlink(data);exit(X) + + // for clear-signed files we have created tempfiles we have to clean up + // and we do an additional check, so fork yet another time … + pid_t pid = ExecFork(); + if(pid < 0) { + ioprintf(std::cerr, "Fork failed for %s to check %s", Args[0], File.c_str()); + UNLINK_EXIT(EINTERNAL); + } + if(pid == 0) + { + if (statusfd != -1) + dup2(fd[1], statusfd); + execvp(gpgvpath.c_str(), (char **) &Args[0]); + ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str()); + UNLINK_EXIT(EINTERNAL); + } + + // Wait and collect the error code - taken from WaitPid as we need the exact Status + int Status; + while (waitpid(pid,&Status,0) != pid) + { + if (errno == EINTR) + continue; + ioprintf(std::cerr, _("Waited for %s but it wasn't there"), "gpgv"); + UNLINK_EXIT(EINTERNAL); + } + + // check if it exit'ed normally … + if (WIFEXITED(Status) == false) + { + ioprintf(std::cerr, _("Sub-process %s exited unexpectedly"), "gpgv"); + UNLINK_EXIT(EINTERNAL); + } + + // … and with a good exit code + if (WEXITSTATUS(Status) != 0) + { + ioprintf(std::cerr, _("Sub-process %s returned an error code (%u)"), "gpgv", WEXITSTATUS(Status)); + UNLINK_EXIT(WEXITSTATUS(Status)); + } + + /* looks like its fine. Our caller will check the status fd, + but we construct a good-known clear-signed file without garbage + and other non-sense. In a perfect world, we get the same file, + but empty lines, trailing whitespaces and stuff makes it inperfect … */ + if (RecombineToClearSignedFile(File, dataFd, dataHeader, sigFd) == false) + { + _error->DumpErrors(std::cerr); + UNLINK_EXIT(EINTERNAL); + } + + // everything fine, we have a clean file now! + UNLINK_EXIT(0); +#undef UNLINK_EXIT + } + exit(EINTERNAL); // unreachable safe-guard +} + /*}}}*/ +// RecombineToClearSignedFile - combine data/signature to message /*{{{*/ +bool RecombineToClearSignedFile(std::string const &OutFile, int const ContentFile, + std::vector const &ContentHeader, int const SignatureFile) +{ + FILE *clean_file = fopen(OutFile.c_str(), "w"); + fputs("-----BEGIN PGP SIGNED MESSAGE-----\n", clean_file); + for (std::vector::const_iterator h = ContentHeader.begin(); h != ContentHeader.end(); ++h) + fprintf(clean_file, "%s\n", h->c_str()); + fputs("\n", clean_file); + + FILE *data_file = fdopen(ContentFile, "r"); + FILE *sig_file = fdopen(SignatureFile, "r"); + if (data_file == NULL || sig_file == NULL) + return _error->Error("Couldn't open splitfiles to recombine them into %s", OutFile.c_str()); + char *buf = NULL; + size_t buf_size = 0; + while (getline(&buf, &buf_size, data_file) != -1) + fputs(buf, clean_file); + fclose(data_file); + fputs("\n", clean_file); + while (getline(&buf, &buf_size, sig_file) != -1) + fputs(buf, clean_file); + fclose(sig_file); + fclose(clean_file); + return true; } /*}}}*/ +// SplitClearSignedFile - split message into data/signature /*{{{*/ +bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, + std::vector * const ContentHeader, int const SignatureFile) +{ + FILE *in = fopen(InFile.c_str(), "r"); + if (in == NULL) + return _error->Errno("fopen", "can not open %s", InFile.c_str()); + + FILE *out_content = NULL; + FILE *out_signature = NULL; + if (ContentFile != -1) + { + out_content = fdopen(ContentFile, "w"); + if (out_content == NULL) + return _error->Errno("fdopen", "Failed to open file to write content to from %s", InFile.c_str()); + } + if (SignatureFile != -1) + { + out_signature = fdopen(SignatureFile, "w"); + if (out_signature == NULL) + return _error->Errno("fdopen", "Failed to open file to write signature to from %s", InFile.c_str()); + } + + bool found_message_start = false; + bool found_message_end = false; + bool skip_until_empty_line = false; + bool found_signature = false; + bool first_line = true; + + char *buf = NULL; + size_t buf_size = 0; + while (getline(&buf, &buf_size, in) != -1) + { + _strrstrip(buf); + if (found_message_start == false) + { + if (strcmp(buf, "-----BEGIN PGP SIGNED MESSAGE-----") == 0) + { + found_message_start = true; + skip_until_empty_line = true; + } + } + else if (skip_until_empty_line == true) + { + if (strlen(buf) == 0) + skip_until_empty_line = false; + // save "Hash" Armor Headers, others aren't allowed + else if (ContentHeader != NULL && strncmp(buf, "Hash: ", strlen("Hash: ")) == 0) + ContentHeader->push_back(buf); + } + else if (found_signature == false) + { + if (strcmp(buf, "-----BEGIN PGP SIGNATURE-----") == 0) + { + found_signature = true; + found_message_end = true; + if (out_signature != NULL) + fprintf(out_signature, "%s\n", buf); + } + else if (found_message_end == false) + { + // we are in the message block + if(first_line == true) // first line does not need a newline + { + if (out_content != NULL) + fprintf(out_content, "%s", buf); + first_line = false; + } + else if (out_content != NULL) + fprintf(out_content, "\n%s", buf); + } + } + else if (found_signature == true) + { + if (out_signature != NULL) + fprintf(out_signature, "%s\n", buf); + if (strcmp(buf, "-----END PGP SIGNATURE-----") == 0) + found_signature = false; // look for other signatures + } + // all the rest is whitespace, unsigned garbage or additional message blocks we ignore + } + if (out_content != NULL) + fclose(out_content); + if (out_signature != NULL) + fclose(out_signature); + + return true; +} diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index 8aeea2fb3..8e04855e4 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -10,6 +10,7 @@ #define CONTRIB_GPGV_H #include +#include #if __GNUC__ >= 4 #define APT_noreturn __attribute__ ((noreturn)) @@ -20,7 +21,9 @@ /** \brief generates and run the command to verify a file with gpgv * * If File and FileSig specify the same file it is assumed that we - * deal with a clear-signed message. + * deal with a clear-signed message. In that case the file will be + * rewritten to be in a good-known format without uneeded whitespaces + * and additional messages (unsigned or signed). * * @param File is the message (unsigned or clear-signed) * @param FileSig is the signature (detached or clear-signed) @@ -35,4 +38,40 @@ inline void ExecGPGV(std::string const &File, std::string const &FileSig, #undef APT_noreturn +/** \brief Split an inline signature into message and signature + * + * Takes a clear-signed message and puts the first signed message + * in the content file and all signatures following it into the + * second. Unsigned messages, additional messages as well as + * whitespaces are discarded. The resulting files are suitable to + * be checked with gpgv. + * + * If one or all Fds are -1 they will not be used and the content + * which would have been written to them is discarded. + * + * The code doesn't support dash-encoded lines as these are not + * expected to be present in files we have to deal with. + * + * @param InFile is the clear-signed file + * @param ContentFile is the Fd the message will be written to + * @param ContentHeader is a list of all required Amored Headers for the message + * @param SignatureFile is the Fd all signatures will be written to + */ +bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, + std::vector * const ContentHeader, int const SignatureFile); + +/** \brief recombines message and signature to an inline signature + * + * Reverses the splitting down by #SplitClearSignedFile by writing + * a well-formed clear-signed message without unsigned messages, + * additional signed messages or just trailing whitespaces + * + * @param OutFile will be clear-signed file + * @param ContentFile is the Fd the message will be read from + * @param ContentHeader is a list of all required Amored Headers for the message + * @param SignatureFile is the Fd all signatures will be read from + */ +bool RecombineToClearSignedFile(std::string const &OutFile, int const ContentFile, + std::vector const &ContentHeader, int const SignatureFile); + #endif diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 6c191fd95..7a88d71e3 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -229,6 +229,8 @@ vector * debReleaseIndex::ComputeIndexTargets() const { /*}}}*/ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const { + bool const tryInRelease = _config->FindB("Acquire::TryInRelease", true); + // special case for --print-uris if (GetAll) { vector *targets = ComputeIndexTargets(); @@ -239,18 +241,27 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const // this is normally created in pkgAcqMetaSig, but if we run // in --print-uris mode, we add it here - new pkgAcqMetaIndex(Owner, MetaIndexURI("Release"), - MetaIndexInfo("Release"), "Release", - MetaIndexURI("Release.gpg"), - ComputeIndexTargets(), - new indexRecords (Dist)); + if (tryInRelease == false) + new pkgAcqMetaIndex(Owner, MetaIndexURI("Release"), + MetaIndexInfo("Release"), "Release", + MetaIndexURI("Release.gpg"), + ComputeIndexTargets(), + new indexRecords (Dist)); } - new pkgAcqMetaSig(Owner, MetaIndexURI("Release.gpg"), - MetaIndexInfo("Release.gpg"), "Release.gpg", - MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release", - ComputeIndexTargets(), - new indexRecords (Dist)); + if (tryInRelease == true) + new pkgAcqMetaClearSig(Owner, MetaIndexURI("InRelease"), + MetaIndexInfo("InRelease"), "InRelease", + MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release", + MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg", + ComputeIndexTargets(), + new indexRecords (Dist)); + else + new pkgAcqMetaSig(Owner, MetaIndexURI("Release.gpg"), + MetaIndexInfo("Release.gpg"), "Release.gpg", + MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release", + ComputeIndexTargets(), + new indexRecords (Dist)); return true; } diff --git a/debian/changelog b/debian/changelog index 77e8674a0..7ebbb1cb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,16 @@ apt (0.9.7.9) UNRELEASED; urgency=low - ExecGPGV is a method which should never return, so mark it as such and fix the inconsistency of returning in error cases - don't close stdout/stderr if it is also the statusfd + - if ExecGPGV deals with a clear-signed file it will split this file + into data and signatures, pass it to gpgv for verification and + recombines it after that in a known-good way without unsigned blocks + and whitespaces resulting usually in more or less the same file as + before, but later code can be sure about the format * apt-pkg/acquire-item.cc: - keep the last good InRelease file around just as we do it with Release.gpg in case the new one we download isn't good for us + * apt-pkg/deb/debmetaindex.cc: + - reenable InRelease by default -- David Kalnischkies Fri, 15 Mar 2013 14:15:43 +0100 diff --git a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only index d97011914..fad5488fb 100755 --- a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only +++ b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only @@ -26,6 +26,14 @@ MD5Sum: 2182897e0a2a0c09e760beaae117a015 2023 Packages.diff/Index 1b895931853981ad8204d2439821b999 4144 Packages.gz'; echo; cat ${RELEASE}.old;) > ${RELEASE} done -aptget update -qq > /dev/null 2> starts-with-unsigned.msg -sed -i 's#File .*InRelease#File InRelease#' starts-with-unsigned.msg -testfileequal starts-with-unsigned.msg "W: GPG error: file: unstable InRelease: File InRelease doesn't start with a clearsigned message" + +msgtest 'The unsigned garbage before signed block is' 'ignored' +aptget update -qq > /dev/null 2>&1 && msgpass || msgfail + +ROOTDIR="$(readlink -f .)" +testequal "Package files: + 100 ${ROOTDIR}/rootdir/var/lib/dpkg/status + release a=now + 500 file:${ROOTDIR}/aptarchive/ unstable/main i386 Packages + release a=unstable,n=unstable,c=main +Pinned packages:" aptcache policy -- cgit v1.2.3 From ad000f6b68f9216412a6a70bcfe6cb11fb0c2fe6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 16 Mar 2013 10:08:28 +0100 Subject: add testcase and update changelog --- debian/changelog | 5 ++ test/integration/test-inrelease-verification-fail | 80 +++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100755 test/integration/test-inrelease-verification-fail diff --git a/debian/changelog b/debian/changelog index 7ebbb1cb4..3ef652c56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,11 @@ apt (0.9.7.9) UNRELEASED; urgency=low Release.gpg in case the new one we download isn't good for us * apt-pkg/deb/debmetaindex.cc: - reenable InRelease by default + + [ Michael Vogt ] + * add regression test for CVE-2013-1051 + * implement GPGSplit() based on the idea from Ansgar Burchardt + (many thanks!) -- David Kalnischkies Fri, 15 Mar 2013 14:15:43 +0100 diff --git a/test/integration/test-inrelease-verification-fail b/test/integration/test-inrelease-verification-fail new file mode 100755 index 000000000..5cbf1ab4d --- /dev/null +++ b/test/integration/test-inrelease-verification-fail @@ -0,0 +1,80 @@ +#!/bin/sh + +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" + +buildsimplenativepackage 'good-pkg' 'all' '1.0' 'stable' + +setupaptarchive + +# now exchange to the Packages file, note that this could be +# done via MITM too +cat > aptarchive/dists/stable/main/binary-i386/Packages < aptarchive/dists/stable/main/binary-i386/Packages.$extension +done + +# add a space into the BEGIN PGP SIGNATURE PART/END PGP SIGNATURE part +# to trick apt - this is still legal to gpg(v) +sed -i '/^-----BEGIN PGP SIGNATURE-----/,/^-----END PGP SIGNATURE-----/ s/^$/ /g' aptarchive/dists/stable/InRelease + +# and append our own hashes for the modified Packages files +cat >> aptarchive/dists/stable/InRelease <> aptarchive/dists/stable/InRelease + # Sources + s="$(sha512sum aptarchive/dists/stable/main/source/Sources$comp | cut -f1 -d' ') $(stat -c %s aptarchive/dists/stable/main/source/Sources$comp) main/source/Sources$comp" + echo " $s" >> aptarchive/dists/stable/InRelease +done; + +# deliver this +changetowebserver + +# ensure the update fails +# useful for debugging to add "-o Debug::pkgAcquire::auth=true" +if aptget update -qq; then + msgfail "apt-get update should NOT work for MITM" + exit 1 +fi + +# ensure there is no package +testequal 'Reading package lists... +Building dependency tree... +E: Unable to locate package bad-mitm' aptget install bad-mitm + +# and verify that its not picked up +#testequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm + +# and that the right one is used +#testequal 'good-pkg: +#+ Installed: (none) +#+ Candidate: 1.0 +#+ Version table: +#+ 1.0 0 +#+ 500 http://localhost/ stable/main i386 Packages' aptcache policy good-pkg -- cgit v1.2.3 From bea263c2c0ecd6715ce996fd9b54599ac2cfa7c2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 16 Mar 2013 12:40:43 +0100 Subject: ensure that we fclose/unlink/free in the new gpg-code as soon as possible --- apt-pkg/contrib/gpgv.cc | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index c236a7289..5921d7c67 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -214,19 +214,25 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, ioprintf(std::cerr, _("Waited for %s but it wasn't there"), "gpgv"); UNLINK_EXIT(EINTERNAL); } +#undef UNLINK_EXIT + // we don't need the files any longer as we have the filedescriptors still open + unlink(sig); + unlink(data); + free(sig); + free(data); // check if it exit'ed normally … if (WIFEXITED(Status) == false) { ioprintf(std::cerr, _("Sub-process %s exited unexpectedly"), "gpgv"); - UNLINK_EXIT(EINTERNAL); + exit(EINTERNAL); } // … and with a good exit code if (WEXITSTATUS(Status) != 0) { ioprintf(std::cerr, _("Sub-process %s returned an error code (%u)"), "gpgv", WEXITSTATUS(Status)); - UNLINK_EXIT(WEXITSTATUS(Status)); + exit(WEXITSTATUS(Status)); } /* looks like its fine. Our caller will check the status fd, @@ -236,12 +242,11 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, if (RecombineToClearSignedFile(File, dataFd, dataHeader, sigFd) == false) { _error->DumpErrors(std::cerr); - UNLINK_EXIT(EINTERNAL); + exit(EINTERNAL); } // everything fine, we have a clean file now! - UNLINK_EXIT(0); -#undef UNLINK_EXIT + exit(0); } exit(EINTERNAL); // unreachable safe-guard } @@ -259,7 +264,10 @@ bool RecombineToClearSignedFile(std::string const &OutFile, int const ContentFil FILE *data_file = fdopen(ContentFile, "r"); FILE *sig_file = fdopen(SignatureFile, "r"); if (data_file == NULL || sig_file == NULL) + { + fclose(clean_file); return _error->Error("Couldn't open splitfiles to recombine them into %s", OutFile.c_str()); + } char *buf = NULL; size_t buf_size = 0; while (getline(&buf, &buf_size, data_file) != -1) @@ -287,13 +295,21 @@ bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, { out_content = fdopen(ContentFile, "w"); if (out_content == NULL) + { + fclose(in); return _error->Errno("fdopen", "Failed to open file to write content to from %s", InFile.c_str()); + } } if (SignatureFile != -1) { out_signature = fdopen(SignatureFile, "w"); if (out_signature == NULL) + { + fclose(in); + if (out_content != NULL) + fclose(out_content); return _error->Errno("fdopen", "Failed to open file to write signature to from %s", InFile.c_str()); + } } bool found_message_start = false; @@ -358,6 +374,7 @@ bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, fclose(out_content); if (out_signature != NULL) fclose(out_signature); + fclose(in); return true; } -- cgit v1.2.3 From d4ddc5b94d6abbd33a3001d27ff5d9698be3f820 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 17 Mar 2013 19:51:02 +0100 Subject: * test/libapt/assert.h, test/libapt/run-tests: - exit with status 1 on test failure --- debian/changelog | 8 ++++++++ test/libapt/assert.h | 2 ++ test/libapt/run-tests | 9 ++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bfc4279b3..ef622c994 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.7.8~exp3) UNRELEASEDexperimental; urgency=low + + [ Niels Thykier ] + * test/libapt/assert.h, test/libapt/run-tests: + - exit with status 1 on test failure + + -- Michael Vogt Sun, 17 Mar 2013 19:46:23 +0100 + apt (0.9.7.8~exp2) experimental; urgency=low * include two missing patches to really fix bug #696225, thanks to diff --git a/test/libapt/assert.h b/test/libapt/assert.h index fdf6740c6..113c057ed 100644 --- a/test/libapt/assert.h +++ b/test/libapt/assert.h @@ -1,4 +1,5 @@ #include +#include #define equals(x,y) assertEquals(y, x, __LINE__) #define equalsNot(x,y) assertEqualsNot(y, x, __LINE__) @@ -6,6 +7,7 @@ template < typename X, typename Y > void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) { std::cerr << "Test FAILED: »" << expect << "« " << compare << " »" << get << "« at line " << line << std::endl; + std::exit(EXIT_FAILURE); } template < typename X, typename Y > diff --git a/test/libapt/run-tests b/test/libapt/run-tests index 45a3157f7..f18be6d2b 100755 --- a/test/libapt/run-tests +++ b/test/libapt/run-tests @@ -7,6 +7,7 @@ echo "Compiling the tests …" echo "Running all testcases …" LDPATH="$DIR/../../build/bin" EXT="_libapt_test" +EXIT_CODE=0 # detect if output is on a terminal (colorful) or better not if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then @@ -106,9 +107,15 @@ do fi echo -n "Testing with ${NAME} " - LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "$TESTOKAY" || echo "$TESTFAIL" + if LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} ; then + echo "$TESTOKAY" + else + echo "$TESTFAIL" + EXIT_CODE=1 + fi if [ -n "$tmppath" -a -d "$tmppath" ]; then rm -rf "$tmppath" fi done +exit $EXIT_CODE -- cgit v1.2.3 From 8c1dd12cb53ce141d8ade2c8abc619dcfa7f37a1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Mar 2013 08:08:37 +0100 Subject: * test/integration/framework: - continue after test failure but preserve exit status --- debian/changelog | 4 ++++ test/integration/framework | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ef622c994..2a86d688a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ apt (0.9.7.8~exp3) UNRELEASEDexperimental; urgency=low [ Niels Thykier ] * test/libapt/assert.h, test/libapt/run-tests: - exit with status 1 on test failure + + [ Daniel Hartwig ] + * test/integration/framework: + - continue after test failure but preserve exit status -- Michael Vogt Sun, 17 Mar 2013 19:46:23 +0100 diff --git a/test/integration/framework b/test/integration/framework index 1c4872c8e..883b65bba 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1,5 +1,7 @@ #!/bin/sh -- # no runable script, just for vi +TESTFAILURES="no" + # we all like colorful messages if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null && \ expr match "$(readlink -f /proc/$$/fd/2)" '/dev/pts/[0-9]\+' > /dev/null; then @@ -36,7 +38,7 @@ msgtest() { } msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; } msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; } -msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; } +msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; TESTFAILURES="yes"; } # enable / disable Debugging MSGLEVEL=${MSGLEVEL:-3} @@ -113,9 +115,13 @@ gdb() { APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which gdb) ${BUILDDIRECTORY}/$1 } +exitwithstatus() { + [ "$TESTFAILURES" = "yes" ] && exit 1 || exit 0; +} + addtrap() { CURRENTTRAP="$CURRENTTRAP $1" - trap "$CURRENTTRAP exit;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM + trap "$CURRENTTRAP exitwithstatus;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM } setupenvironment() { -- cgit v1.2.3 From f91bd741d223395cc3b1a609459e7d7226916e86 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Mar 2013 11:38:19 +0100 Subject: report failures via exit and ensure we don't overflow --- test/integration/framework | 11 ++++++++--- test/integration/run-tests | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 883b65bba..cdaa20627 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1,6 +1,6 @@ #!/bin/sh -- # no runable script, just for vi -TESTFAILURES="no" +TESTFAILURES=0 # we all like colorful messages if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null && \ @@ -38,7 +38,7 @@ msgtest() { } msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; } msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; } -msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; TESTFAILURES="yes"; } +msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; TESTFAILURES=$((TESTFAILURES+1)); } # enable / disable Debugging MSGLEVEL=${MSGLEVEL:-3} @@ -116,7 +116,12 @@ gdb() { } exitwithstatus() { - [ "$TESTFAILURES" = "yes" ] && exit 1 || exit 0; + # error if we about to overflow, but ... + # "255 failures ought to be enough for everybody" + if [ $TESTFAILURES -gt 255 ]; then + msgdie "Total failure count $TESTFAILURES too big" + fi + exit $((TESTFAILURES <= 255 ? TESTFAILURES : 255)); } addtrap() { diff --git a/test/integration/run-tests b/test/integration/run-tests index 75f2ad662..18474b20f 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -37,4 +37,5 @@ for testcase in $(run-parts --list $DIR | grep '/test-'); do done echo "failures: $FAIL" -exit $FAIL +# ensure we don't overflow +exit $((FAIL <= 255 ? FAIL : 255)) -- cgit v1.2.3 From 5d76cee187ea6f1443c6afd0d1cf99f3555304ef Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Mar 2013 11:46:20 +0100 Subject: test/integration/framework: use EXIT_CODE to be consistent with the run-tests code --- test/integration/framework | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index cdaa20627..4a70573c8 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1,6 +1,6 @@ #!/bin/sh -- # no runable script, just for vi -TESTFAILURES=0 +EXIT_CODE=0 # we all like colorful messages if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null && \ @@ -38,7 +38,7 @@ msgtest() { } msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; } msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; } -msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; TESTFAILURES=$((TESTFAILURES+1)); } +msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; EXIT_CODE=$((EXIT_CODE+1)); } # enable / disable Debugging MSGLEVEL=${MSGLEVEL:-3} @@ -118,10 +118,10 @@ gdb() { exitwithstatus() { # error if we about to overflow, but ... # "255 failures ought to be enough for everybody" - if [ $TESTFAILURES -gt 255 ]; then - msgdie "Total failure count $TESTFAILURES too big" + if [ $EXIT_CODE -gt 255 ]; then + msgdie "Total failure count $EXIT_CODE too big" fi - exit $((TESTFAILURES <= 255 ? TESTFAILURES : 255)); + exit $((EXIT_CODE <= 255 ? EXIT_CODE : 255)); } addtrap() { -- cgit v1.2.3 From c8b860fb8d0f1531f99db4fad74f5892c6806f1b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Mar 2013 12:10:35 +0100 Subject: fix pkgTagSection::Exists() and add test --- apt-pkg/tagfile.cc | 9 ++++++- apt-pkg/tagfile.h | 4 ++-- test/libapt/makefile | 9 ++++++- test/libapt/tagfile_test.cc | 57 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 test/libapt/tagfile_test.cc diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 79811899a..1c79ee74f 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -282,10 +282,17 @@ void pkgTagSection::Trim() for (; Stop > Section + 2 && (Stop[-2] == '\n' || Stop[-2] == '\r'); Stop--); } /*}}}*/ +// TagSection::Exists - return True if a tag exists /*{{{*/ +bool pkgTagSection::Exists(const char* const Tag) +{ + unsigned int tmp; + return Find(Tag, tmp); +} + /*}}}*/ // TagSection::Find - Locate a tag /*{{{*/ // --------------------------------------------------------------------- /* This searches the section for a tag that matches the given string. */ -bool pkgTagSection::Find(const char *Tag,unsigned &Pos) const +bool pkgTagSection::Find(const char *Tag,unsigned int &Pos) const { unsigned int Length = strlen(Tag); unsigned int I = AlphaIndexes[AlphaHash(Tag)]; diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index fd24471c1..4718f5101 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -59,7 +59,7 @@ class pkgTagSection inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;}; bool Find(const char *Tag,const char *&Start, const char *&End) const; - bool Find(const char *Tag,unsigned &Pos) const; + bool Find(const char *Tag,unsigned int &Pos) const; std::string FindS(const char *Tag) const; signed int FindI(const char *Tag,signed long Default = 0) const ; unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const; @@ -73,7 +73,7 @@ class pkgTagSection virtual void TrimRecord(bool BeforeRecord, const char* &End); inline unsigned int Count() const {return TagCount;}; - inline bool Exists(const char* const Tag) {return AlphaIndexes[AlphaHash(Tag)] != 0;} + bool Exists(const char* const Tag); inline void Get(const char *&Start,const char *&Stop,unsigned int I) const {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];} diff --git a/test/libapt/makefile b/test/libapt/makefile index 5e225f240..953e455e0 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -93,8 +93,15 @@ SLIBS = -lapt-pkg SOURCE = cdromreducesourcelist_test.cc include $(PROGRAM_H) -# text IndexCopy::ConvertToSourceList +# test IndexCopy::ConvertToSourceList PROGRAM = IndexCopyToSourceList${BASENAME} SLIBS = -lapt-pkg SOURCE = indexcopytosourcelist_test.cc include $(PROGRAM_H) + +# test tagfile +PROGRAM = PkgTagFile${BASENAME} +SLIBS = -lapt-pkg +SOURCE = tagfile_test.cc +include $(PROGRAM_H) + diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc new file mode 100644 index 000000000..2e2144f99 --- /dev/null +++ b/test/libapt/tagfile_test.cc @@ -0,0 +1,57 @@ +#include +#include + +#include "assert.h" +#include +#include + +char *tempfile = NULL; +int tempfile_fd = -1; + +void remove_tmpfile(void) +{ + if (tempfile_fd > 0) + close(tempfile_fd); + if (tempfile != NULL) { + unlink(tempfile); + free(tempfile); + } +} + +int main(int argc, char *argv[]) +{ + FileFd fd; + const char contents[] = "FieldA-12345678: the value of the field"; + atexit(remove_tmpfile); + tempfile = strdup("apt-test.XXXXXXXX"); + tempfile_fd = mkstemp(tempfile); + + /* (Re-)Open (as FileFd), write and seek to start of the temp file */ + equals(fd.OpenDescriptor(tempfile_fd, FileFd::ReadWrite), true); + equals(fd.Write(contents, strlen(contents)), true); + equals(fd.Seek(0), true); + + pkgTagFile tfile(&fd); + pkgTagSection section; + equals(tfile.Step(section), true); + + /* It has one field */ + equals(section.Count(), 1); + + /* ... and it is called FieldA-12345678 */ + equals(section.Exists("FieldA-12345678"), true); + + /* its value is correct */ + equals(section.FindS("FieldA-12345678"), std::string("the value of the field")); + /* A non-existent field has an empty string as value */ + equals(section.FindS("FieldB-12345678"), std::string()); + + /* ... and Exists does not lie about missing fields... */ + equalsNot(section.Exists("FieldB-12345678"), true); + + /* There is only one section in this tag file */ + equals(tfile.Step(section), false); + + /* clean up handled by atexit handler, so just return here */ + return 0; +} -- cgit v1.2.3 From 0c98ee5ade6bb660bf23b09d759e0bb3c52068b9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Mar 2013 13:52:43 +0100 Subject: test/libapt/tagfile_test.cc: add missing "unistd.h" (thanks to Niels Thykier) --- test/libapt/tagfile_test.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc index 2e2144f99..d12c74c95 100644 --- a/test/libapt/tagfile_test.cc +++ b/test/libapt/tagfile_test.cc @@ -4,6 +4,7 @@ #include "assert.h" #include #include +#include char *tempfile = NULL; int tempfile_fd = -1; -- cgit v1.2.3 From 34747d46be3a15105d896266d8043f55d04e7735 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 18 Mar 2013 17:06:51 +0100 Subject: rename testcase to mention CVE number, make the code more consistent with the rest and add some more tests (by fixing commented ones) --- .../test-cve-2013-1051-InRelease-parsing | 61 +++++++++++++++++ test/integration/test-inrelease-verification-fail | 80 ---------------------- 2 files changed, 61 insertions(+), 80 deletions(-) create mode 100755 test/integration/test-cve-2013-1051-InRelease-parsing delete mode 100755 test/integration/test-inrelease-verification-fail diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing new file mode 100755 index 000000000..bd68fccf6 --- /dev/null +++ b/test/integration/test-cve-2013-1051-InRelease-parsing @@ -0,0 +1,61 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'i386' + +insertpackage 'stable' 'good-pkg' 'all' '1.0' + +setupaptarchive + +changetowebserver +ARCHIVE='http://localhost/' +msgtest 'Initial apt-get update should work with' 'InRelease' +aptget update -qq && msgpass || msgfail + +# check that the setup is correct +testequal "good-pkg: + Installed: (none) + Candidate: 1.0 + Version table: + 1.0 0 + 500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg + +# now exchange to the Packages file, note that this could be +# done via MITM too +insertpackage 'stable' 'bad-mitm' 'all' '1.0' + +# this builds compressed files and a new (unsigned) Release +buildaptarchivefromfiles '+1hour' + +# add a space into the BEGIN PGP SIGNATURE PART/END PGP SIGNATURE part +# to trick apt - this is still legal to gpg(v) +sed -i '/^-----BEGIN PGP SIGNATURE-----/,/^-----END PGP SIGNATURE-----/ s/^$/ /g' aptarchive/dists/stable/InRelease + +# we append the (evil unsigned) Release file to the (good signed) InRelease +cat aptarchive/dists/stable/Release >> aptarchive/dists/stable/InRelease + + +# ensure the update fails +# useful for debugging to add "-o Debug::pkgAcquire::auth=true" +msgtest 'apt-get update for should fail with the modified' 'InRelease' +aptget update 2>&1 | grep -q 'Hash Sum mismatch' > /dev/null && msgpass || msgfail + +# ensure there is no package +testequal 'Reading package lists... +Building dependency tree... +E: Unable to locate package bad-mitm' aptget install bad-mitm -s + +# and verify that its not picked up +testequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm -q=0 + +# and that the right one is used +testequal "good-pkg: + Installed: (none) + Candidate: 1.0 + Version table: + 1.0 0 + 500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg diff --git a/test/integration/test-inrelease-verification-fail b/test/integration/test-inrelease-verification-fail deleted file mode 100755 index 5cbf1ab4d..000000000 --- a/test/integration/test-inrelease-verification-fail +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -set -e - -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework - -setupenvironment -configarchitecture "i386" - -buildsimplenativepackage 'good-pkg' 'all' '1.0' 'stable' - -setupaptarchive - -# now exchange to the Packages file, note that this could be -# done via MITM too -cat > aptarchive/dists/stable/main/binary-i386/Packages < aptarchive/dists/stable/main/binary-i386/Packages.$extension -done - -# add a space into the BEGIN PGP SIGNATURE PART/END PGP SIGNATURE part -# to trick apt - this is still legal to gpg(v) -sed -i '/^-----BEGIN PGP SIGNATURE-----/,/^-----END PGP SIGNATURE-----/ s/^$/ /g' aptarchive/dists/stable/InRelease - -# and append our own hashes for the modified Packages files -cat >> aptarchive/dists/stable/InRelease <> aptarchive/dists/stable/InRelease - # Sources - s="$(sha512sum aptarchive/dists/stable/main/source/Sources$comp | cut -f1 -d' ') $(stat -c %s aptarchive/dists/stable/main/source/Sources$comp) main/source/Sources$comp" - echo " $s" >> aptarchive/dists/stable/InRelease -done; - -# deliver this -changetowebserver - -# ensure the update fails -# useful for debugging to add "-o Debug::pkgAcquire::auth=true" -if aptget update -qq; then - msgfail "apt-get update should NOT work for MITM" - exit 1 -fi - -# ensure there is no package -testequal 'Reading package lists... -Building dependency tree... -E: Unable to locate package bad-mitm' aptget install bad-mitm - -# and verify that its not picked up -#testequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm - -# and that the right one is used -#testequal 'good-pkg: -#+ Installed: (none) -#+ Candidate: 1.0 -#+ Version table: -#+ 1.0 0 -#+ 500 http://localhost/ stable/main i386 Packages' aptcache policy good-pkg -- cgit v1.2.3 From f1828b6977972b4ef6da6401602b7938f6570c32 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 18 Mar 2013 19:36:55 +0100 Subject: - add method to open (maybe) clearsigned files transparently * ftparchive/writer.cc: - use OpenMaybeClearSignedFile to be free from detecting and skipping clearsigning metadata in dsc files --- apt-pkg/contrib/gpgv.cc | 55 +++++++++++++++++++++++- apt-pkg/contrib/gpgv.h | 22 ++++++++++ debian/changelog | 6 ++- ftparchive/writer.cc | 105 ++++++++++++++++++++------------------------- test/integration/framework | 10 ++++- 5 files changed, 135 insertions(+), 63 deletions(-) diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 5921d7c67..fc16dd32c 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -19,7 +19,7 @@ #include /*}}}*/ -char * GenerateTemporaryFileTemplate(const char *basename) /*{{{*/ +static char * GenerateTemporaryFileTemplate(const char *basename) /*{{{*/ { const char *tmpdir = getenv("TMPDIR"); #ifdef P_tmpdir @@ -376,5 +376,58 @@ bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, fclose(out_signature); fclose(in); + if (found_signature == true) + return _error->Error("Signature in file %s wasn't closed", InFile.c_str()); + + // if we haven't found any of them, this an unsigned file, + // so don't generate an error, but splitting was unsuccessful none-the-less + if (found_message_start == false && found_message_end == false) + return false; + // otherwise one missing indicates a syntax error + else if (found_message_start == false || found_message_end == false) + return _error->Error("Splitting of file %s failed as it doesn't contain all expected parts", InFile.c_str()); + return true; } + /*}}}*/ +bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &MessageFile) /*{{{*/ +{ + char * const message = GenerateTemporaryFileTemplate("fileutl.message"); + int const messageFd = mkstemp(message); + if (messageFd == -1) + { + free(message); + return _error->Errno("mkstemp", "Couldn't create temporary file to work with %s", ClearSignedFileName.c_str()); + } + // we have the fd, thats enough for us + unlink(message); + free(message); + + int const duppedMsg = dup(messageFd); + if (duppedMsg == -1) + return _error->Errno("dup", "Couldn't duplicate FD to work with %s", ClearSignedFileName.c_str()); + + _error->PushToStack(); + bool const splitDone = SplitClearSignedFile(ClearSignedFileName.c_str(), messageFd, NULL, -1); + bool const errorDone = _error->PendingError(); + _error->MergeWithStack(); + if (splitDone == false) + { + close(duppedMsg); + + if (errorDone == true) + return false; + + // we deal with an unsigned file + MessageFile.Open(ClearSignedFileName, FileFd::ReadOnly); + } + else // clear-signed + { + if (lseek(duppedMsg, 0, SEEK_SET) < 0) + return _error->Errno("lseek", "Unable to seek back in message fd for file %s", ClearSignedFileName.c_str()); + MessageFile.OpenDescriptor(duppedMsg, FileFd::ReadOnly, true); + } + + return MessageFile.Failed() == false; +} + /*}}}*/ diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index 8e04855e4..ab7d35ab1 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -12,6 +12,8 @@ #include #include +#include + #if __GNUC__ >= 4 #define APT_noreturn __attribute__ ((noreturn)) #else @@ -52,10 +54,17 @@ inline void ExecGPGV(std::string const &File, std::string const &FileSig, * The code doesn't support dash-encoded lines as these are not * expected to be present in files we have to deal with. * + * The content of the split files is undefined if the splitting was + * unsuccessful. + * + * Note that trying to split an unsigned file will fail, but + * not generate an error message. + * * @param InFile is the clear-signed file * @param ContentFile is the Fd the message will be written to * @param ContentHeader is a list of all required Amored Headers for the message * @param SignatureFile is the Fd all signatures will be written to + * @return true if the splitting was successful, false otherwise */ bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, std::vector * const ContentHeader, int const SignatureFile); @@ -74,4 +83,17 @@ bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, bool RecombineToClearSignedFile(std::string const &OutFile, int const ContentFile, std::vector const &ContentHeader, int const SignatureFile); +/** \brief open a file which might be clear-signed + * + * This method tries to extract the (signed) message of a file. + * If the file isn't signed it will just open the given filename. + * Otherwise the message is extracted to a temporary file which + * will be opened instead. + * + * @param ClearSignedFileName is the name of the file to open + * @param[out] MessageFile is the FileFd in which the file will be opened + * @return true if opening was successful, otherwise false + */ +bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &MessageFile); + #endif diff --git a/debian/changelog b/debian/changelog index 3ef652c56..27fae657c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,12 +12,16 @@ apt (0.9.7.9) UNRELEASED; urgency=low recombines it after that in a known-good way without unsigned blocks and whitespaces resulting usually in more or less the same file as before, but later code can be sure about the format + - add method to open (maybe) clearsigned files transparently * apt-pkg/acquire-item.cc: - keep the last good InRelease file around just as we do it with Release.gpg in case the new one we download isn't good for us * apt-pkg/deb/debmetaindex.cc: - reenable InRelease by default - + * ftparchive/writer.cc: + - use OpenMaybeClearSignedFile to be free from detecting and + skipping clearsigning metadata in dsc files + [ Michael Vogt ] * add regression test for CVE-2013-1051 * implement GPGSplit() based on the idea from Ansgar Burchardt diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 3065526ad..d26b160f9 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include @@ -598,77 +600,62 @@ SourcesWriter::SourcesWriter(string const &BOverrides,string const &SOverrides, // --------------------------------------------------------------------- /* */ bool SourcesWriter::DoPackage(string FileName) -{ +{ // Open the archive - FileFd F(FileName,FileFd::ReadOnly); - if (_error->PendingError() == true) + FileFd F; + if (OpenMaybeClearSignedFile(FileName, F) == false) return false; - - // Stat the file for later - struct stat St; - if (fstat(F.Fd(),&St) != 0) - return _error->Errno("fstat","Failed to stat %s",FileName.c_str()); - if (St.st_size > 128*1024) + unsigned long long const FSize = F.FileSize(); + //FIXME: do we really need to enforce a maximum size of the dsc file? + if (FSize > 128*1024) return _error->Error("DSC file '%s' is too large!",FileName.c_str()); - - if (BufSize < (unsigned long long)St.st_size+1) + + if (BufSize < FSize + 2) { - BufSize = St.st_size+1; - Buffer = (char *)realloc(Buffer,St.st_size+1); + BufSize = FSize + 2; + Buffer = (char *)realloc(Buffer , BufSize); } - - if (F.Read(Buffer,St.st_size) == false) + + if (F.Read(Buffer, FSize) == false) return false; + // Stat the file for later (F might be clearsigned, so not F.FileSize()) + struct stat St; + if (stat(FileName.c_str(), &St) != 0) + return _error->Errno("fstat","Failed to stat %s",FileName.c_str()); + // Hash the file char *Start = Buffer; - char *BlkEnd = Buffer + St.st_size; - - MD5Summation MD5; - SHA1Summation SHA1; - SHA256Summation SHA256; - SHA256Summation SHA512; - - if (DoMD5 == true) - MD5.Add((unsigned char *)Start,BlkEnd - Start); - if (DoSHA1 == true) - SHA1.Add((unsigned char *)Start,BlkEnd - Start); - if (DoSHA256 == true) - SHA256.Add((unsigned char *)Start,BlkEnd - Start); - if (DoSHA512 == true) - SHA512.Add((unsigned char *)Start,BlkEnd - Start); + char *BlkEnd = Buffer + FSize; - // Add an extra \n to the end, just in case - *BlkEnd++ = '\n'; - - /* Remove the PGP trailer. Some .dsc's have this without a blank line - before */ - const char *Key = "-----BEGIN PGP SIGNATURE-----"; - for (char *MsgEnd = Start; MsgEnd < BlkEnd - strlen(Key) -1; MsgEnd++) + Hashes DscHashes; + if (FSize == (unsigned long long) St.st_size) { - if (*MsgEnd == '\n' && strncmp(MsgEnd+1,Key,strlen(Key)) == 0) - { - MsgEnd[1] = '\n'; - break; - } + if (DoMD5 == true) + DscHashes.MD5.Add((unsigned char *)Start,BlkEnd - Start); + if (DoSHA1 == true) + DscHashes.SHA1.Add((unsigned char *)Start,BlkEnd - Start); + if (DoSHA256 == true) + DscHashes.SHA256.Add((unsigned char *)Start,BlkEnd - Start); + if (DoSHA512 == true) + DscHashes.SHA512.Add((unsigned char *)Start,BlkEnd - Start); } - - /* Read records until we locate the Source record. This neatly skips the - GPG header (which is RFC822 formed) without any trouble. */ - pkgTagSection Tags; - do + else { - unsigned Pos; - if (Tags.Scan(Start,BlkEnd - Start) == false) - return _error->Error("Could not find a record in the DSC '%s'",FileName.c_str()); - if (Tags.Find("Source",Pos) == true) - break; - Start += Tags.size(); + FileFd DscFile(FileName, FileFd::ReadOnly); + DscHashes.AddFD(DscFile, St.st_size, DoMD5, DoSHA1, DoSHA256, DoSHA512); } - while (1); + + // Add extra \n to the end, just in case (as in clearsigned they are missing) + *BlkEnd++ = '\n'; + *BlkEnd++ = '\n'; + + pkgTagSection Tags; + if (Tags.Scan(Start,BlkEnd - Start) == false || Tags.Exists("Source") == false) + return _error->Error("Could not find a record in the DSC '%s'",FileName.c_str()); Tags.Trim(); - + // Lookup the overide information, finding first the best priority. string BestPrio; string Bins = Tags.FindS("Binary"); @@ -732,25 +719,25 @@ bool SourcesWriter::DoPackage(string FileName) string const strippedName = flNotDir(FileName); std::ostringstream ostreamFiles; if (DoMD5 == true && Tags.Exists("Files")) - ostreamFiles << "\n " << string(MD5.Result()) << " " << St.st_size << " " + ostreamFiles << "\n " << string(DscHashes.MD5.Result()) << " " << St.st_size << " " << strippedName << "\n " << Tags.FindS("Files"); string const Files = ostreamFiles.str(); std::ostringstream ostreamSha1; if (DoSHA1 == true && Tags.Exists("Checksums-Sha1")) - ostreamSha1 << "\n " << string(SHA1.Result()) << " " << St.st_size << " " + ostreamSha1 << "\n " << string(DscHashes.SHA1.Result()) << " " << St.st_size << " " << strippedName << "\n " << Tags.FindS("Checksums-Sha1"); string const ChecksumsSha1 = ostreamSha1.str(); std::ostringstream ostreamSha256; if (DoSHA256 == true && Tags.Exists("Checksums-Sha256")) - ostreamSha256 << "\n " << string(SHA256.Result()) << " " << St.st_size << " " + ostreamSha256 << "\n " << string(DscHashes.SHA256.Result()) << " " << St.st_size << " " << strippedName << "\n " << Tags.FindS("Checksums-Sha256"); string const ChecksumsSha256 = ostreamSha256.str(); std::ostringstream ostreamSha512; if (Tags.Exists("Checksums-Sha512")) - ostreamSha512 << "\n " << string(SHA512.Result()) << " " << St.st_size << " " + ostreamSha512 << "\n " << string(DscHashes.SHA512.Result()) << " " << St.st_size << " " << strippedName << "\n " << Tags.FindS("Checksums-Sha512"); string const ChecksumsSha512 = ostreamSha512.str(); diff --git a/test/integration/framework b/test/integration/framework index 1c4872c8e..2ef61ca84 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -328,9 +328,15 @@ Package: $NAME" >> ${BUILDDIR}/debian/control fi echo '3.0 (native)' > ${BUILDDIR}/debian/source/format - local SRCS="$( (cd ${BUILDDIR}/..; dpkg-source -b ${NAME}-${VERSION} 2>&1) | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')" - for SRC in $SRCS; do + (cd ${BUILDDIR}/..; dpkg-source -b ${NAME}-${VERSION} 2>&1) | sed -n 's#^dpkg-source: info: building [^ ]\+ in ##p' \ + | while read SRC; do echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist +# if expr match "${SRC}" '.*\.dsc' >/dev/null 2>&1; then +# gpg --yes --no-default-keyring --secret-keyring ./keys/joesixpack.sec \ +# --keyring ./keys/joesixpack.pub --default-key 'Joe Sixpack' \ +# --clearsign -o "${BUILDDIR}/../${SRC}.sign" "${BUILDDIR}/../$SRC" +# mv "${BUILDDIR}/../${SRC}.sign" "${BUILDDIR}/../$SRC" +# fi done for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do -- cgit v1.2.3 From 233b78083f6f79730fcb5a6faeb74e2a78b6038a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 18 Mar 2013 22:57:08 +0100 Subject: * apt-pkg/deb/debindexfile.cc, apt-pkg/deb/deblistparser.cc: - use OpenMaybeClearSignedFile to be free from detecting and skipping clearsigning metadata in dsc and Release files We can't write a "clean" file to disk as not all acquire methods copy Release files before checking them (e.g. cdrom), so this reverts recombining, but uses the method we use for dsc files also in the two places we deal with Release files --- apt-pkg/contrib/gpgv.cc | 44 ++--------------------------------------- apt-pkg/contrib/gpgv.h | 14 ------------- apt-pkg/deb/debindexfile.cc | 8 +++++++- apt-pkg/deb/deblistparser.cc | 12 +---------- apt-pkg/indexrecords.cc | 6 +++++- debian/changelog | 11 +++++------ test/integration/framework | 2 +- test/integration/test-apt-cdrom | 2 ++ 8 files changed, 23 insertions(+), 76 deletions(-) diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index fc16dd32c..7e244c623 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -215,7 +215,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, UNLINK_EXIT(EINTERNAL); } #undef UNLINK_EXIT - // we don't need the files any longer as we have the filedescriptors still open + // we don't need the files any longer unlink(sig); unlink(data); free(sig); @@ -235,52 +235,12 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, exit(WEXITSTATUS(Status)); } - /* looks like its fine. Our caller will check the status fd, - but we construct a good-known clear-signed file without garbage - and other non-sense. In a perfect world, we get the same file, - but empty lines, trailing whitespaces and stuff makes it inperfect … */ - if (RecombineToClearSignedFile(File, dataFd, dataHeader, sigFd) == false) - { - _error->DumpErrors(std::cerr); - exit(EINTERNAL); - } - - // everything fine, we have a clean file now! + // everything fine exit(0); } exit(EINTERNAL); // unreachable safe-guard } /*}}}*/ -// RecombineToClearSignedFile - combine data/signature to message /*{{{*/ -bool RecombineToClearSignedFile(std::string const &OutFile, int const ContentFile, - std::vector const &ContentHeader, int const SignatureFile) -{ - FILE *clean_file = fopen(OutFile.c_str(), "w"); - fputs("-----BEGIN PGP SIGNED MESSAGE-----\n", clean_file); - for (std::vector::const_iterator h = ContentHeader.begin(); h != ContentHeader.end(); ++h) - fprintf(clean_file, "%s\n", h->c_str()); - fputs("\n", clean_file); - - FILE *data_file = fdopen(ContentFile, "r"); - FILE *sig_file = fdopen(SignatureFile, "r"); - if (data_file == NULL || sig_file == NULL) - { - fclose(clean_file); - return _error->Error("Couldn't open splitfiles to recombine them into %s", OutFile.c_str()); - } - char *buf = NULL; - size_t buf_size = 0; - while (getline(&buf, &buf_size, data_file) != -1) - fputs(buf, clean_file); - fclose(data_file); - fputs("\n", clean_file); - while (getline(&buf, &buf_size, sig_file) != -1) - fputs(buf, clean_file); - fclose(sig_file); - fclose(clean_file); - return true; -} - /*}}}*/ // SplitClearSignedFile - split message into data/signature /*{{{*/ bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, std::vector * const ContentHeader, int const SignatureFile) diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index ab7d35ab1..8cbe553bc 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -69,20 +69,6 @@ inline void ExecGPGV(std::string const &File, std::string const &FileSig, bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, std::vector * const ContentHeader, int const SignatureFile); -/** \brief recombines message and signature to an inline signature - * - * Reverses the splitting down by #SplitClearSignedFile by writing - * a well-formed clear-signed message without unsigned messages, - * additional signed messages or just trailing whitespaces - * - * @param OutFile will be clear-signed file - * @param ContentFile is the Fd the message will be read from - * @param ContentHeader is a list of all required Amored Headers for the message - * @param SignatureFile is the Fd all signatures will be read from - */ -bool RecombineToClearSignedFile(std::string const &OutFile, int const ContentFile, - std::vector const &ContentHeader, int const SignatureFile); - /** \brief open a file which might be clear-signed * * This method tries to extract the (signed) message of a file. diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index de645bb6e..909dfcf47 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include /*}}}*/ @@ -337,7 +338,12 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const if (releaseExists == true || FileExists(ReleaseFile) == true) { - FileFd Rel(ReleaseFile,FileFd::ReadOnly); + FileFd Rel; + // Beware: The 'Release' file might be clearsigned in case the + // signature for an 'InRelease' file couldn't be checked + if (OpenMaybeClearSignedFile(ReleaseFile, Rel) == false) + return false; + if (_error->PendingError() == true) return false; Parser.LoadReleaseInfo(File,Rel,Section); diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index b84bd6fdd..2c014a734 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -800,13 +800,12 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI, map_ptrloc const storage = WriteUniqString(component); FileI->Component = storage; - // FIXME: Code depends on the fact that Release files aren't compressed + // FIXME: should use FileFd and TagSection FILE* release = fdopen(dup(File.Fd()), "r"); if (release == NULL) return false; char buffer[101]; - bool gpgClose = false; while (fgets(buffer, sizeof(buffer), release) != NULL) { size_t len = 0; @@ -818,15 +817,6 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI, if (buffer[len] == '\0') continue; - // only evalute the first GPG section - if (strncmp("-----", buffer, 5) == 0) - { - if (gpgClose == true) - break; - gpgClose = true; - continue; - } - // seperate the tag from the data const char* dataStart = strchr(buffer + len, ':'); if (dataStart == NULL) diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index af2639beb..1461a24bb 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -57,7 +58,10 @@ bool indexRecords::Exists(string const &MetaKey) const bool indexRecords::Load(const string Filename) /*{{{*/ { - FileFd Fd(Filename, FileFd::ReadOnly); + FileFd Fd; + if (OpenMaybeClearSignedFile(Filename, Fd) == false) + return false; + pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX if (_error->PendingError() == true) { diff --git a/debian/changelog b/debian/changelog index 27fae657c..7c02b2689 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,19 +8,18 @@ apt (0.9.7.9) UNRELEASED; urgency=low and fix the inconsistency of returning in error cases - don't close stdout/stderr if it is also the statusfd - if ExecGPGV deals with a clear-signed file it will split this file - into data and signatures, pass it to gpgv for verification and - recombines it after that in a known-good way without unsigned blocks - and whitespaces resulting usually in more or less the same file as - before, but later code can be sure about the format + into data and signatures, pass it to gpgv for verification - add method to open (maybe) clearsigned files transparently * apt-pkg/acquire-item.cc: - keep the last good InRelease file around just as we do it with Release.gpg in case the new one we download isn't good for us * apt-pkg/deb/debmetaindex.cc: - reenable InRelease by default - * ftparchive/writer.cc: + * ftparchive/writer.cc, + apt-pkg/deb/debindexfile.cc, + apt-pkg/deb/deblistparser.cc: - use OpenMaybeClearSignedFile to be free from detecting and - skipping clearsigning metadata in dsc files + skipping clearsigning metadata in dsc and Release files [ Michael Vogt ] * add regression test for CVE-2013-1051 diff --git a/test/integration/framework b/test/integration/framework index 2ef61ca84..86e6ed7c3 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -114,7 +114,7 @@ gdb() { } addtrap() { - CURRENTTRAP="$CURRENTTRAP $1" + CURRENTTRAP="$1 $CURRENTTRAP" trap "$CURRENTTRAP exit;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM } diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index f24c99b36..f1c4fd9d3 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -24,6 +24,8 @@ cat Translation-de | xz --format=lzma > Translation-de.lzma cat Translation-de | xz > Translation-de.xz rm Translation-en Translation-de cd - > /dev/null +addtrap "chmod -R +w $PWD/rootdir/media/cdrom/dists/;" +chmod -R -w rootdir/media/cdrom/dists aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1 sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log -- cgit v1.2.3 From b408e4ad0010b273dac0af7dc87ab61062d89e49 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 19 Mar 2013 10:49:57 +0100 Subject: use FileFd instead of int fds to tidy up the interface a bit --- apt-pkg/contrib/gpgv.cc | 103 ++++++++++++++++++++++-------------------------- apt-pkg/contrib/gpgv.h | 12 +++--- 2 files changed, 53 insertions(+), 62 deletions(-) diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 7e244c623..54cc4c6d0 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -41,6 +41,7 @@ static char * GenerateTemporaryFileTemplate(const char *basename) /*{{{*/ Also, as gpgv has no options to enforce a certain reduced style of clear-signed files (=the complete content of the file is signed and the content isn't encoded) we do a divide and conquer approach here + and split up the clear-signed file in message and signature for gpgv */ void ExecGPGV(std::string const &File, std::string const &FileGPG, int const &statusfd, int fd[2]) @@ -108,8 +109,6 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, } } - int sigFd = -1; - int dataFd = -1; std::vector dataHeader; char * sig = NULL; char * data = NULL; @@ -126,17 +125,29 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, data = GenerateTemporaryFileTemplate("apt.data"); if (sig == NULL || data == NULL) { + ioprintf(std::cerr, "Couldn't create tempfile names for splitting up %s", File.c_str()); + exit(EINTERNAL); + } + + int const sigFd = mkstemp(sig); + int const dataFd = mkstemp(data); + if (sigFd == -1 || dataFd == -1) + { + if (dataFd != -1) + unlink(sig); + if (sigFd != -1) + unlink(data); ioprintf(std::cerr, "Couldn't create tempfiles for splitting up %s", File.c_str()); exit(EINTERNAL); } - sigFd = mkstemp(sig); - dataFd = mkstemp(data); - int const duppedSigFd = dup(sigFd); - int const duppedDataFd = dup(dataFd); + FileFd signature; + signature.OpenDescriptor(sigFd, FileFd::WriteOnly, true); + FileFd message; + message.OpenDescriptor(dataFd, FileFd::WriteOnly, true); - if (dataFd == -1 || sigFd == -1 || duppedDataFd == -1 || duppedSigFd == -1 || - SplitClearSignedFile(File, duppedDataFd, &dataHeader, duppedSigFd) == false) + if (signature.Failed() == true || message.Failed() == true || + SplitClearSignedFile(File, &message, &dataHeader, &signature) == false) { if (dataFd != -1) unlink(sig); @@ -145,8 +156,6 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, ioprintf(std::cerr, "Splitting up %s into data and signature failed", File.c_str()); exit(EINTERNAL); } - lseek(dataFd, 0, SEEK_SET); - lseek(sigFd, 0, SEEK_SET); Args.push_back(sig); Args.push_back(data); } @@ -242,36 +251,13 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG, } /*}}}*/ // SplitClearSignedFile - split message into data/signature /*{{{*/ -bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, - std::vector * const ContentHeader, int const SignatureFile) +bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, + std::vector * const ContentHeader, FileFd * const SignatureFile) { FILE *in = fopen(InFile.c_str(), "r"); if (in == NULL) return _error->Errno("fopen", "can not open %s", InFile.c_str()); - FILE *out_content = NULL; - FILE *out_signature = NULL; - if (ContentFile != -1) - { - out_content = fdopen(ContentFile, "w"); - if (out_content == NULL) - { - fclose(in); - return _error->Errno("fdopen", "Failed to open file to write content to from %s", InFile.c_str()); - } - } - if (SignatureFile != -1) - { - out_signature = fdopen(SignatureFile, "w"); - if (out_signature == NULL) - { - fclose(in); - if (out_content != NULL) - fclose(out_content); - return _error->Errno("fdopen", "Failed to open file to write signature to from %s", InFile.c_str()); - } - } - bool found_message_start = false; bool found_message_end = false; bool skip_until_empty_line = false; @@ -280,7 +266,8 @@ bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, char *buf = NULL; size_t buf_size = 0; - while (getline(&buf, &buf_size, in) != -1) + ssize_t line_len = 0; + while ((line_len = getline(&buf, &buf_size, in)) != -1) { _strrstrip(buf); if (found_message_start == false) @@ -305,35 +292,40 @@ bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, { found_signature = true; found_message_end = true; - if (out_signature != NULL) - fprintf(out_signature, "%s\n", buf); + if (SignatureFile != NULL) + { + SignatureFile->Write(buf, strlen(buf)); + SignatureFile->Write("\n", 1); + } } else if (found_message_end == false) { // we are in the message block if(first_line == true) // first line does not need a newline { - if (out_content != NULL) - fprintf(out_content, "%s", buf); + if (ContentFile != NULL) + ContentFile->Write(buf, strlen(buf)); first_line = false; } - else if (out_content != NULL) - fprintf(out_content, "\n%s", buf); + else if (ContentFile != NULL) + { + ContentFile->Write("\n", 1); + ContentFile->Write(buf, strlen(buf)); + } } } else if (found_signature == true) { - if (out_signature != NULL) - fprintf(out_signature, "%s\n", buf); + if (SignatureFile != NULL) + { + SignatureFile->Write(buf, strlen(buf)); + SignatureFile->Write("\n", 1); + } if (strcmp(buf, "-----END PGP SIGNATURE-----") == 0) found_signature = false; // look for other signatures } // all the rest is whitespace, unsigned garbage or additional message blocks we ignore } - if (out_content != NULL) - fclose(out_content); - if (out_signature != NULL) - fclose(out_signature); fclose(in); if (found_signature == true) @@ -363,17 +355,17 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me unlink(message); free(message); - int const duppedMsg = dup(messageFd); - if (duppedMsg == -1) - return _error->Errno("dup", "Couldn't duplicate FD to work with %s", ClearSignedFileName.c_str()); + MessageFile.OpenDescriptor(messageFd, FileFd::ReadWrite, true); + if (MessageFile.Failed() == true) + return _error->Error("Couldn't open temporary file to work with %s", ClearSignedFileName.c_str()); _error->PushToStack(); - bool const splitDone = SplitClearSignedFile(ClearSignedFileName.c_str(), messageFd, NULL, -1); + bool const splitDone = SplitClearSignedFile(ClearSignedFileName.c_str(), &MessageFile, NULL, NULL); bool const errorDone = _error->PendingError(); _error->MergeWithStack(); if (splitDone == false) { - close(duppedMsg); + MessageFile.Close(); if (errorDone == true) return false; @@ -383,9 +375,8 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me } else // clear-signed { - if (lseek(duppedMsg, 0, SEEK_SET) < 0) - return _error->Errno("lseek", "Unable to seek back in message fd for file %s", ClearSignedFileName.c_str()); - MessageFile.OpenDescriptor(duppedMsg, FileFd::ReadOnly, true); + if (MessageFile.Seek(0) == false) + return _error->Errno("lseek", "Unable to seek back in message for file %s", ClearSignedFileName.c_str()); } return MessageFile.Failed() == false; diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index 8cbe553bc..1f877fc2d 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -48,8 +48,8 @@ inline void ExecGPGV(std::string const &File, std::string const &FileSig, * whitespaces are discarded. The resulting files are suitable to * be checked with gpgv. * - * If one or all Fds are -1 they will not be used and the content - * which would have been written to them is discarded. + * If a FileFd pointers is NULL it will not be used and the content + * which would have been written to it is silently discarded. * * The code doesn't support dash-encoded lines as these are not * expected to be present in files we have to deal with. @@ -61,13 +61,13 @@ inline void ExecGPGV(std::string const &File, std::string const &FileSig, * not generate an error message. * * @param InFile is the clear-signed file - * @param ContentFile is the Fd the message will be written to + * @param ContentFile is the FileFd the message will be written to * @param ContentHeader is a list of all required Amored Headers for the message - * @param SignatureFile is the Fd all signatures will be written to + * @param SignatureFile is the FileFd all signatures will be written to * @return true if the splitting was successful, false otherwise */ -bool SplitClearSignedFile(std::string const &InFile, int const ContentFile, - std::vector * const ContentHeader, int const SignatureFile); +bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, + std::vector * const ContentHeader, FileFd * const SignatureFile); /** \brief open a file which might be clear-signed * -- cgit v1.2.3 From cb32348956441e33733e6bd8c2c572f19600dc25 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 19 Mar 2013 12:37:50 +0100 Subject: support dash-escaped text in clearsigned files as implementations are free to escape all lines (we have no lines in our files which need to be escaped as these would be invalid fieldnames) and while ExecGPGV would detect dash-escaped text as invalid (as its not expected in messages with detached signatures) it would be possible to "comment" lines in (signed) dsc files which are only parsed but not verified --- apt-pkg/contrib/gpgv.cc | 23 ++++++++++++----------- apt-pkg/contrib/gpgv.h | 3 --- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index 54cc4c6d0..ba059dd87 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -298,20 +298,21 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, SignatureFile->Write("\n", 1); } } - else if (found_message_end == false) + else if (found_message_end == false) // we are in the message block { - // we are in the message block + // we don't have any fields which need dash-escaped, + // but implementations are free to encode all lines … + char const * dashfree = buf; + if (strncmp(dashfree, "- ", 2) == 0) + dashfree += 2; if(first_line == true) // first line does not need a newline - { - if (ContentFile != NULL) - ContentFile->Write(buf, strlen(buf)); first_line = false; - } else if (ContentFile != NULL) - { ContentFile->Write("\n", 1); - ContentFile->Write(buf, strlen(buf)); - } + else + continue; + if (ContentFile != NULL) + ContentFile->Write(dashfree, strlen(dashfree)); } } else if (found_signature == true) @@ -333,10 +334,10 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, // if we haven't found any of them, this an unsigned file, // so don't generate an error, but splitting was unsuccessful none-the-less - if (found_message_start == false && found_message_end == false) + if (first_line == true && found_message_start == false && found_message_end == false) return false; // otherwise one missing indicates a syntax error - else if (found_message_start == false || found_message_end == false) + else if (first_line == false || found_message_start == false || found_message_end == false) return _error->Error("Splitting of file %s failed as it doesn't contain all expected parts", InFile.c_str()); return true; diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h index 1f877fc2d..08b10a97a 100644 --- a/apt-pkg/contrib/gpgv.h +++ b/apt-pkg/contrib/gpgv.h @@ -51,9 +51,6 @@ inline void ExecGPGV(std::string const &File, std::string const &FileSig, * If a FileFd pointers is NULL it will not be used and the content * which would have been written to it is silently discarded. * - * The code doesn't support dash-encoded lines as these are not - * expected to be present in files we have to deal with. - * * The content of the split files is undefined if the splitting was * unsuccessful. * -- cgit v1.2.3 From 231232ec8aa183421669ee7d984434028db7f97d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 20 Mar 2013 12:17:05 +0100 Subject: apt-pkg/edsp.cc: do not spam stderr in WriteSolution --- apt-pkg/edsp.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index 6ce9da784..b125d4bfb 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -474,8 +474,10 @@ bool EDSP::WriteSolution(pkgDepCache &Cache, FILE* output) { fprintf(output, "Autoremove: %d\n", Pkg.CurrentVer()->ID); if (Debug == true) + { fprintf(output, "Package: %s\nVersion: %s\n", Pkg.FullName().c_str(), Pkg.CurrentVer().VerStr()); fprintf(stderr, "Autoremove: %s\nVersion: %s\n", Pkg.FullName().c_str(), Pkg.CurrentVer().VerStr()); + } } else continue; -- cgit v1.2.3 From b830da6163c6a55c8f12c219a6d00c7a479338da Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 20 Mar 2013 12:18:16 +0100 Subject: apt-pkg/edsp.cc: do not use stderr in WriteSolution at all --- apt-pkg/edsp.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index b125d4bfb..e90598392 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -474,10 +474,7 @@ bool EDSP::WriteSolution(pkgDepCache &Cache, FILE* output) { fprintf(output, "Autoremove: %d\n", Pkg.CurrentVer()->ID); if (Debug == true) - { fprintf(output, "Package: %s\nVersion: %s\n", Pkg.FullName().c_str(), Pkg.CurrentVer().VerStr()); - fprintf(stderr, "Autoremove: %s\nVersion: %s\n", Pkg.FullName().c_str(), Pkg.CurrentVer().VerStr()); - } } else continue; -- cgit v1.2.3 From 945d2a8aeecf844137843265e72d7991f77c3353 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 21 Mar 2013 16:18:58 +0100 Subject: merge patch from Colin to fix error message from getaddrinfo() (#703603) --- debian/changelog | 5 +++++ methods/connect.cc | 3 +++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2a86d688a..68dd8c395 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,11 @@ apt (0.9.7.8~exp3) UNRELEASEDexperimental; urgency=low * test/integration/framework: - continue after test failure but preserve exit status + [ Colin Watson ] + * methods/connect.cc: + - provide useful error message in case of EAI_SYSTEM + (closes: #703603) + -- Michael Vogt Sun, 17 Mar 2013 19:46:23 +0100 apt (0.9.7.8~exp2) experimental; urgency=low diff --git a/methods/connect.cc b/methods/connect.cc index 9a092a43c..3573d3cbf 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -197,6 +197,9 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd, return _error->Error(_("Temporary failure resolving '%s'"), Host.c_str()); } + if (Res == EAI_SYSTEM) + return _error->Error(_("System error resolving '%s:%s' (%s)"), + Host.c_str(),ServStr,strerror(errno)); return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"), Host.c_str(),ServStr,Res,gai_strerror(Res)); } -- cgit v1.2.3 From ccd01d7e09ff595233d4ed6dff1a1c73bd2b5193 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Fri, 22 Mar 2013 07:17:05 +0100 Subject: Turkish (Mert Dirik). Closes: #703526 --- debian/changelog | 3 + po/tr.po | 3494 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3497 insertions(+) create mode 100644 po/tr.po diff --git a/debian/changelog b/debian/changelog index 68dd8c395..a4a0b4c6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ apt (0.9.7.8~exp3) UNRELEASEDexperimental; urgency=low * test/integration/framework: - continue after test failure but preserve exit status + [ Programs translation updates ] + * Turkish (Mert Dirik). Closes: #703526 + [ Colin Watson ] * methods/connect.cc: - provide useful error message in case of EAI_SYSTEM diff --git a/po/tr.po b/po/tr.po new file mode 100644 index 000000000..a502f9e54 --- /dev/null +++ b/po/tr.po @@ -0,0 +1,3494 @@ +# Turkish translation for apt +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# Copyright (c) 2013 Debian L10n Turkish 2013 +# Mert Dirik , 2013. +# This file is distributed under the same license as the apt package. +# Rosetta Contributors, 2009. +msgid "" +msgstr "" +"Project-Id-Version: apt\n" +"Report-Msgid-Bugs-To: APT Development Team \n" +"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"PO-Revision-Date: 2013-02-18 03:41+0200\n" +"Last-Translator: Mert Dirik \n" +"Language-Team: Debian l10n Turkish\n" +"Language: tr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n>1);\n" +"X-Generator: Poedit 1.5.5\n" +"X-Launchpad-Export-Date: 2013-02-04 12:16+0000\n" + +#: cmdline/apt-cache.cc:158 +#, c-format +msgid "Package %s version %s has an unmet dep:\n" +msgstr "%s paketinin (sürüm %s) karşılanamayan bir bağımlılığı var:\n" + +#: cmdline/apt-cache.cc:286 +msgid "Total package names: " +msgstr "Toplam paketlerin adları: " + +#: cmdline/apt-cache.cc:288 +msgid "Total package structures: " +msgstr "Toplam paket yapıları: " + +#: cmdline/apt-cache.cc:328 +msgid " Normal packages: " +msgstr " Normal paketler: " + +#: cmdline/apt-cache.cc:329 +msgid " Pure virtual packages: " +msgstr " Saf sanal paketler: " + +#: cmdline/apt-cache.cc:330 +msgid " Single virtual packages: " +msgstr " Tekil sanal paketler: " + +#: cmdline/apt-cache.cc:331 +msgid " Mixed virtual packages: " +msgstr " Karışık sanal paketler: " + +#: cmdline/apt-cache.cc:332 +msgid " Missing: " +msgstr " Eksik: " + +#: cmdline/apt-cache.cc:334 +msgid "Total distinct versions: " +msgstr "Toplam farklı sürümler: " + +#: cmdline/apt-cache.cc:336 +msgid "Total distinct descriptions: " +msgstr "Toplam farklı açıklamalar: " + +#: cmdline/apt-cache.cc:338 +msgid "Total dependencies: " +msgstr "Toplam bağımlılıklar: " + +#: cmdline/apt-cache.cc:341 +msgid "Total ver/file relations: " +msgstr "Toplam sürüm/dosya ilişkileri: " + +#: cmdline/apt-cache.cc:343 +msgid "Total Desc/File relations: " +msgstr "Toplam Tanım/Dosya ilişkileri: " + +#: cmdline/apt-cache.cc:345 +msgid "Total Provides mappings: " +msgstr "Toplam destekleme eşleştirmeleri: " + +#: cmdline/apt-cache.cc:357 +msgid "Total globbed strings: " +msgstr "Toplam birikmiş dizgiler: " + +#: cmdline/apt-cache.cc:371 +msgid "Total dependency version space: " +msgstr "Toplam bağlımlık sürümü alanı: " + +#: cmdline/apt-cache.cc:376 +msgid "Total slack space: " +msgstr "Toplam serbest alan: " + +#: cmdline/apt-cache.cc:384 +msgid "Total space accounted for: " +msgstr "Hesaplanan toplam alan: " + +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#, c-format +msgid "Package file %s is out of sync." +msgstr "%s paket dosyası eşzamansız." + +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 +#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 +msgid "No packages found" +msgstr "Hiç paket bulunamadı" + +#: cmdline/apt-cache.cc:1226 +msgid "You must give at least one search pattern" +msgstr "En az bir arama örüntüsü vermelisiniz" + +#: cmdline/apt-cache.cc:1361 +msgid "This command is deprecated. Please use 'apt-mark showauto' instead." +msgstr "" +"Bu komutun kullanımı bırakılmıştır. Lütfen bunun yerine 'apt-mark showauto' " +"komutunu kullanın." + +#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#, c-format +msgid "Unable to locate package %s" +msgstr "%s paketi bulunamadı" + +#: cmdline/apt-cache.cc:1486 +msgid "Package files:" +msgstr "Paket dosyaları:" + +#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +msgid "Cache is out of sync, can't x-ref a package file" +msgstr "Önbellek eşzamanlı değil, paket dosyası 'x-ref' yapılamıyor." + +#. Show any packages have explicit pins +#: cmdline/apt-cache.cc:1507 +msgid "Pinned packages:" +msgstr "Sabitlenmiş paketler:" + +#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +msgid "(not found)" +msgstr "(bulunamadı)" + +#: cmdline/apt-cache.cc:1527 +msgid " Installed: " +msgstr " Kurulu: " + +#: cmdline/apt-cache.cc:1528 +msgid " Candidate: " +msgstr " Aday: " + +#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +msgid "(none)" +msgstr "(hiçbiri)" + +#: cmdline/apt-cache.cc:1561 +msgid " Package pin: " +msgstr " Paket sabitleme: " + +#. Show the priority tables +#: cmdline/apt-cache.cc:1570 +msgid " Version table:" +msgstr " Sürüm çizelgesi:" + +#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 +#, c-format +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s (%s için) %s %s tarihinde derlendi\n" + +#: cmdline/apt-cache.cc:1690 +msgid "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache is a low-level tool used to query information\n" +"from APT's binary cache files\n" +"\n" +"Commands:\n" +" gencaches - Build both the package and source cache\n" +" showpkg - Show some general information for a single package\n" +" showsrc - Show source records\n" +" stats - Show some basic statistics\n" +" dump - Show the entire file in a terse form\n" +" dumpavail - Print an available file to stdout\n" +" unmet - Show unmet dependencies\n" +" search - Search the package list for a regex pattern\n" +" show - Show a readable record for the package\n" +" depends - Show raw dependency information for a package\n" +" rdepends - Show reverse dependency information for a package\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" +" xvcg - Generate package graphs for xvcg\n" +" policy - Show policy settings\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -p=? The package cache.\n" +" -s=? The source cache.\n" +" -q Disable progress indicator.\n" +" -i Show only important deps for the unmet command.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +msgstr "" +"Kullanım: apt-cache [seçenekler] komut\n" +" apt-cache [seçenekler] showpkg paket1 [paket2 ...]\n" +" apt-cache [seçenekler] showsrc paket1 [paket2 ...]\n" +"\n" +"apt-cache APT'nin ikili paket önbelleğindeki dosyaları\n" +"sorgulamakta kullanılan alt seviye bir araçtır.\n" +"\n" +"Komutlar:\n" +" gencaches - Hem paket hem de kaynak önbelleğini oluştur\n" +" showpkg - Tek bir paket hakkındaki genel bilgileri görüntüle\n" +" showsrc - Paket kayıtlarını görüntüle\n" +" stats - Bir takım basit istatistikleri görüntüle\n" +" dump - Bütün dosyayı kısa biçimde görüntüle\n" +" dumpavail - Uygun bir dosyayı standart çıktıya yazdır\n" +" unmet - Karşılanmayan bağımlılıkları görüntüle\n" +" search - Paket listesini bir düzenli ifade ile ara\n" +" show - Bir paketin okunabilir kaydını görüntüle\n" +" depends - Bir paketin bağımlılık bilgilerini ham haliyle görüntüle\n" +" rdepends - Bir paketin ters bağımlılık bilgilerini görüntüle\n" +" pkgnames - Sistemdeki tüm paketlerin adlarını listele\n" +" dotty - GraphViz için paket grafikleri üret\n" +" xvcg - xvcg için paket grafikleri üret\n" +" policy - İlke seçeneklerini görüntüle\n" +"\n" +"Options:\n" +" -h Bu yardım metni.\n" +" -p=? Paket önbelleği.\n" +" -s=? Kaynak önbelleği.\n" +" -q İlerleme göstergesini kapat.\n" +" -i unmet komutunda yalnızca önemli bağımlılıkları görüntüle.\n" +" -c=? Belirtilen yapılandırma dosyasını kullan\n" +" -o=? Herhangi bir yapılandırma seçeneğini ayarla, örneğin -o dir::cache=/" +"tmp\n" +"Ayrıntılı bilgi için apt-cache(8) ve apt.conf(5) rehber sayfalarına göz " +"atın.\n" + +#: cmdline/apt-cdrom.cc:79 +msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" +msgstr "Lütfen bu CD/DVD'ye bir isim verin, örneğin 'Debian 5.0.3 Disk 1'" + +#: cmdline/apt-cdrom.cc:94 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Lütfen sürücüye bir Disk yerleştirin ve giriş tuşuna (Enter) basın" + +#: cmdline/apt-cdrom.cc:129 +#, c-format +msgid "Failed to mount '%s' to '%s'" +msgstr "'%s', '%s' konumuna bağlanamadı" + +#: cmdline/apt-cdrom.cc:163 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Kalan CD'leriniz için bu işlemi yineleyin." + +#: cmdline/apt-config.cc:46 +msgid "Arguments not in pairs" +msgstr "Değişkenler (argüman) çiftler halinde değil" + +#: cmdline/apt-config.cc:87 +msgid "" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is a simple tool to read the APT config file\n" +"\n" +"Commands:\n" +" shell - Shell mode\n" +" dump - Show the configuration\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Kullanım: apt-config [seçenekler] komut\n" +"\n" +"apt-config, APT ayar dosyasını okumaya yarayan basit bir araçtır\n" +"\n" +"Komutlar:\n" +" shell - Kabuk kipi\n" +" dump - Ayarları görüntüle\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım dosyası.\n" +" -c=? Belirtilen ayar dosyasını görüntüler\n" +" -o=? İsteğe bağlı ayar seçeneği belirtmenizi sağlar, örneğin -o dir::" +"cache=/tmp\n" + +#: cmdline/apt-get.cc:135 +msgid "Y" +msgstr "E" + +#: cmdline/apt-get.cc:140 +msgid "N" +msgstr "H" + +#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 +#, c-format +msgid "Regex compilation error - %s" +msgstr "Regex derleme hatası - %s" + +#: cmdline/apt-get.cc:260 +msgid "The following packages have unmet dependencies:" +msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:" + +#: cmdline/apt-get.cc:350 +#, c-format +msgid "but %s is installed" +msgstr "ama %s kurulu" + +#: cmdline/apt-get.cc:352 +#, c-format +msgid "but %s is to be installed" +msgstr "ama %s kurulacak" + +#: cmdline/apt-get.cc:359 +msgid "but it is not installable" +msgstr "ama kurulabilir değil" + +#: cmdline/apt-get.cc:361 +msgid "but it is a virtual package" +msgstr "ama o bir sanal paket" + +#: cmdline/apt-get.cc:364 +msgid "but it is not installed" +msgstr "ama kurulu değil" + +#: cmdline/apt-get.cc:364 +msgid "but it is not going to be installed" +msgstr "ama kurulmayacak" + +#: cmdline/apt-get.cc:369 +msgid " or" +msgstr " ya da" + +#: cmdline/apt-get.cc:398 +msgid "The following NEW packages will be installed:" +msgstr "Aşağıdaki YENİ paketler kurulacak:" + +#: cmdline/apt-get.cc:424 +msgid "The following packages will be REMOVED:" +msgstr "Aşağıdaki paketler KALDIRILACAK:" + +#: cmdline/apt-get.cc:446 +msgid "The following packages have been kept back:" +msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:" + +#: cmdline/apt-get.cc:467 +msgid "The following packages will be upgraded:" +msgstr "Aşağıdaki paketler yükseltilecek:" + +#: cmdline/apt-get.cc:488 +msgid "The following packages will be DOWNGRADED:" +msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:" + +#: cmdline/apt-get.cc:508 +msgid "The following held packages will be changed:" +msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:" + +#: cmdline/apt-get.cc:563 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (%s nedeniyle) " + +#: cmdline/apt-get.cc:571 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"UYARI: Aşağıdaki temel paketler kaldırılacak.\n" +"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!" + +#: cmdline/apt-get.cc:602 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, " + +#: cmdline/apt-get.cc:606 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu paket yeniden kurulacak, " + +#: cmdline/apt-get.cc:608 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu paketin sürümü düşürülecek, " + +#: cmdline/apt-get.cc:610 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n" + +#: cmdline/apt-get.cc:614 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" + +#: cmdline/apt-get.cc:635 +#, c-format +msgid "Note, selecting '%s' for task '%s'\n" +msgstr "Bilgi, '%2$s' görevi için '%1$s' seçiliyor\n" + +#: cmdline/apt-get.cc:640 +#, c-format +msgid "Note, selecting '%s' for regex '%s'\n" +msgstr "Bilgi, '%2$s' düzenli ifadesi için '%1$s' seçiliyor\n" + +#: cmdline/apt-get.cc:657 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "%s paketi sanal bir pakettir, bu paketi sağlayan:\n" + +#: cmdline/apt-get.cc:668 +msgid " [Installed]" +msgstr " [Kuruldu]" + +#: cmdline/apt-get.cc:677 +msgid " [Not candidate version]" +msgstr " [Aday sürüm değil]" + +#: cmdline/apt-get.cc:679 +msgid "You should explicitly select one to install." +msgstr "Kurmak için adaylardan birini açıkça seçmelisiniz." + +#: cmdline/apt-get.cc:682 +#, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" +"%s paketi mevcut değil, ancak başka paket içerisinden işaret edilmiş.\n" +"Bu durum bu paketin kayıp, eskidiği için bırakılmış, ya da başka bir\n" +"yazılım kaynağında bulunduğu anlamına gelebilir.\n" + +#: cmdline/apt-get.cc:700 +msgid "However the following packages replace it:" +msgstr "Yine de aşağıdaki paketler onun yerine geçecek:" + +#: cmdline/apt-get.cc:712 +#, c-format +msgid "Package '%s' has no installation candidate" +msgstr "'%s' paketi için kurulum adayı yok" + +#: cmdline/apt-get.cc:725 +#, c-format +msgid "Virtual packages like '%s' can't be removed\n" +msgstr "'%s' gibi sanal paketler kaldırılamaz\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"'%s' kurulu değildi, dolayısıyla kaldırılmadı. Bunu mu demek istediniz: " +"'%s'?\n" + +#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "'%s' kurulu değildi, dolayısıyla kaldırılmadı.\n" + +#: cmdline/apt-get.cc:788 +#, c-format +msgid "Note, selecting '%s' instead of '%s'\n" +msgstr "Bilgi, '%2$s' yerine '%1$s' seçiliyor\n" + +#: cmdline/apt-get.cc:818 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "%s atlanıyor, bu paket zaten kurulu ve yükseltme seçilmemiş.\n" + +#: cmdline/apt-get.cc:822 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" +"%s atlanıyor, bu paket kurulu değil ve sadece yükseltmeler isteniyor.\n" + +#: cmdline/apt-get.cc:834 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" +"%s paketinin yeniden kurulumu mümkün değil, çünkü paket internetten " +"indirilemedi.\n" + +#: cmdline/apt-get.cc:839 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s zaten en yeni sürümde.\n" + +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s elle kurulmuş olarak ayarlı.\n" + +#: cmdline/apt-get.cc:884 +#, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "'%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n" + +#: cmdline/apt-get.cc:889 +#, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "'%4$s' nedeniyle '%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n" + +#: cmdline/apt-get.cc:1025 +msgid "Correcting dependencies..." +msgstr "Bağımlılıklar düzeltiliyor..." + +#: cmdline/apt-get.cc:1028 +msgid " failed." +msgstr " başarısız oldu." + +#: cmdline/apt-get.cc:1031 +msgid "Unable to correct dependencies" +msgstr "Bağımlılıklar düzeltilemedi" + +#: cmdline/apt-get.cc:1034 +msgid "Unable to minimize the upgrade set" +msgstr "Yükseltme kümesi küçültülemiyor" + +#: cmdline/apt-get.cc:1036 +msgid " Done" +msgstr " Tamamlandı" + +#: cmdline/apt-get.cc:1040 +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "" +"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız " +"gerekebilir." + +#: cmdline/apt-get.cc:1043 +msgid "Unmet dependencies. Try using -f." +msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin." + +#: cmdline/apt-get.cc:1068 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!" + +#: cmdline/apt-get.cc:1072 +msgid "Authentication warning overridden.\n" +msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n" + +#: cmdline/apt-get.cc:1079 +msgid "Install these packages without verification [y/N]? " +msgstr "Paketler doğrulanmadan kurulsun mu [e/H]? " + +#: cmdline/apt-get.cc:1081 +msgid "Some packages could not be authenticated" +msgstr "Bazı paketlerin kimlik denetimi yapılamadı" + +#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 +msgid "There are problems and -y was used without --force-yes" +msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı" + +#: cmdline/apt-get.cc:1131 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!" + +#: cmdline/apt-get.cc:1140 +msgid "Packages need to be removed but remove is disabled." +msgstr "" +"Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı " +"bırakılmış." + +#: cmdline/apt-get.cc:1151 +msgid "Internal error, Ordering didn't finish" +msgstr "İç hata, Sıralama tamamlanamadı" + +#: cmdline/apt-get.cc:1189 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Ne kadar ilginç.. Boyutlar eşleşmedi, apt@packages.debian.org adresine " +"eposta atın." + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1196 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "%sB/%sB arşiv dosyası indirilecek.\n" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1201 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "%sB arşiv dosyası indirilecek.\n" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1208 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Bu işlem tamamlandıktan sonra %sB ek disk alanı kullanılacak.\n" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:1213 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n" + +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 +#: cmdline/apt-get.cc:2592 +#, c-format +msgid "Couldn't determine free space in %s" +msgstr "%s içindeki boş alan miktarı belirlenemedi" + +#: cmdline/apt-get.cc:1241 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "%s içinde yeterli boş alanınız yok." + +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" +"Yalnızca Önemsiz seçeneği ayarlandı, fakat bu önemsiz bir işlem bir değil." + +#: cmdline/apt-get.cc:1259 +msgid "Yes, do as I say!" +msgstr "Evet, söylediğim şekilde yap!" + +#: cmdline/apt-get.cc:1261 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Tehlikeli bir iş yapmak üzeresiniz.\n" +"Devam etmek için '%s' ifadesini yazınız\n" +" ?] " + +#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +msgid "Abort." +msgstr "Vazgeç." + +#: cmdline/apt-get.cc:1282 +msgid "Do you want to continue [Y/n]? " +msgstr "Devam etmek istiyor musunuz [E/h]? " + +#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "%s ağdan alınamadı. %s\n" + +#: cmdline/apt-get.cc:1372 +msgid "Some files failed to download" +msgstr "Bazı dosyalar indirilemedi" + +#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +msgid "Download complete and in download only mode" +msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde" + +#: cmdline/apt-get.cc:1379 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Bazı arşivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing " +"seçeneğini ekleyerek düzeltmeyi deneyin." + +#: cmdline/apt-get.cc:1383 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing seçeneği ve ortam takası şu an için desteklenmiyor" + +#: cmdline/apt-get.cc:1388 +msgid "Unable to correct missing packages." +msgstr "Eksik paketler düzeltilemedi." + +#: cmdline/apt-get.cc:1389 +msgid "Aborting install." +msgstr "Kurulum iptal ediliyor." + +#: cmdline/apt-get.cc:1417 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paket\n" +"sisteminizden kayboldu:" +msgstr[1] "" +"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paketler\n" +"sisteminizden kayboldu:" + +#: cmdline/apt-get.cc:1421 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Not: Bu eylem dpkg tarafından otomatik ve kasıtlı olarak yapılmıştır." + +#: cmdline/apt-get.cc:1559 +#, c-format +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "Mevcut olmayan hedef '%s' sürüm '%s' paketini ihmal et" + +#: cmdline/apt-get.cc:1591 +#, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Kaynak paket olarak '%s' yerine '%s' kullanılacak\n" + +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1629 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "'%2$s' paketinin mevcut olmayan '%1$s' sürümünü görmezden gel" + +#: cmdline/apt-get.cc:1645 +msgid "The update command takes no arguments" +msgstr "'update' komutu bağımsız değişken almamaktadır" + +#: cmdline/apt-get.cc:1711 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nesneleri silmemiz beklenemez, AutoRemover çalıştırılamıyor" + +#: cmdline/apt-get.cc:1815 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"AutoRemover yapmaması gereken bir yıkıma\n" +"sebep oldu. Lütfen apt hakkında bir hata raporu doldurun." + +#. +#. if (Packages == 1) +#. { +#. c1out << endl; +#. c1out << +#. _("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.") << endl; +#. } +#. +#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +msgid "The following information may help to resolve the situation:" +msgstr "Aşağıdaki bilgiler durumu çözmenize yardımcı olabilir:" + +#: cmdline/apt-get.cc:1822 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "İç hata, AutoRemover bazı şeyleri bozdu" + +#: cmdline/apt-get.cc:1829 +msgid "" +"The following package was automatically installed and is no longer required:" +msgid_plural "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr[0] "" +"Aşağıdaki paket otomatik olarak kurulmuş ve artık bu pakete gerek duyulmuyor:" +msgstr[1] "" +"Aşağıdaki paketler otomatik olarak kurulmuş ve artık bu paketlere gerek " +"duyulmuyor:" + +#: cmdline/apt-get.cc:1833 +#, c-format +msgid "%lu package was automatically installed and is no longer required.\n" +msgid_plural "" +"%lu packages were automatically installed and are no longer required.\n" +msgstr[0] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n" +msgstr[1] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n" + +#: cmdline/apt-get.cc:1835 +msgid "Use 'apt-get autoremove' to remove it." +msgid_plural "Use 'apt-get autoremove' to remove them." +msgstr[0] "Bu paketi kaldırmak için 'apt-get autoremove' komutunu kullanın." +msgstr[1] "Bu paketleri kaldırmak için 'apt-get autoremove' komutunu kullanın." + +#: cmdline/apt-get.cc:1854 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "İç hata, AllUpgrade bazı şeyleri bozdu" + +#: cmdline/apt-get.cc:1953 +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "" +"Bunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız " +"gerekebilir:" + +#: cmdline/apt-get.cc:1957 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Karşılanmamış bağımlılıklar. 'apt-get -f install' komutunu paket seçeneği " +"vermeden deneyin (ya da bir çözüm belirtin)." + +#: cmdline/apt-get.cc:1972 +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" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" +"Bazı paketler kurulamadı. Bu durum, olanaksız bir durum istemiş\n" +"olduğunuzu ya da kararsız (unstable) dağıtımı kullandığınızı ve\n" +"bazı paketlerin henüz oluşturulamamış ya da oluşturulmakta\n" +"olduğunu gösterir." + +#: cmdline/apt-get.cc:1993 +msgid "Broken packages" +msgstr "Bozuk paketler" + +#: cmdline/apt-get.cc:2019 +msgid "The following extra packages will be installed:" +msgstr "Aşağıdaki ek paketler de kurulacak:" + +#: cmdline/apt-get.cc:2109 +msgid "Suggested packages:" +msgstr "Önerilen paketler:" + +#: cmdline/apt-get.cc:2110 +msgid "Recommended packages:" +msgstr "Tavsiye edilen paketler:" + +#: cmdline/apt-get.cc:2152 +#, c-format +msgid "Couldn't find package %s" +msgstr "%s paketi bulunamadı" + +#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#, c-format +msgid "%s set to automatically installed.\n" +msgstr "%s otomatik olarak kurulmuş şekilde ayarlandı.\n" + +#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +msgid "" +"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " +"instead." +msgstr "" +"Bu komut artık kullanılmamaktadır. Bunun yerine 'apt-mark auto' ve 'apt-mark " +"manual' kullanın." + +#: cmdline/apt-get.cc:2183 +msgid "Calculating upgrade... " +msgstr "Yükseltme hesaplanıyor... " + +#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +msgid "Failed" +msgstr "Başarısız" + +#: cmdline/apt-get.cc:2191 +msgid "Done" +msgstr "Bitti" + +#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +msgid "Internal error, problem resolver broke stuff" +msgstr "İç hata, sorun çözücü nesneyi bozdu" + +#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +msgid "Unable to lock the download directory" +msgstr "İndirme dizini kilitlenemiyor" + +#: cmdline/apt-get.cc:2386 +#, c-format +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı" + +#: cmdline/apt-get.cc:2391 +#, c-format +msgid "Downloading %s %s" +msgstr "İndiriliyor %s %s" + +#: cmdline/apt-get.cc:2451 +msgid "Must specify at least one package to fetch source for" +msgstr "Kaynağının indirileceği en az bir paket seçilmeli" + +#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#, c-format +msgid "Unable to find a source package for %s" +msgstr "%s paketinin kaynak paketi bulunamadı" + +#: cmdline/apt-get.cc:2508 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" +"NOT: '%s' paketlemesi '%s' sürüm kontrol sistemiyle aşağıdaki adreste " +"yapılmaktadır:\n" +"%s\n" + +#: cmdline/apt-get.cc:2513 +#, c-format +msgid "" +"Please use:\n" +"bzr branch %s\n" +"to retrieve the latest (possibly unreleased) updates to the package.\n" +msgstr "" +"Bu paketin en son (ve muhtemelen henüz yayımlanmamış olan)\n" +"sürümünü edinmek için lütfen:\n" +"bzr branch %s\n" +"komutunu kullanın.\n" + +#: cmdline/apt-get.cc:2566 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n" + +#: cmdline/apt-get.cc:2603 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "%s üzerinde yeterli boş alan yok" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:2612 +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" +msgstr "%sB/%sB kaynak arşivi indirilecek.\n" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: cmdline/apt-get.cc:2617 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "%sB kaynak arşivi indirilecek.\n" + +#: cmdline/apt-get.cc:2623 +#, c-format +msgid "Fetch source %s\n" +msgstr "%s kaynağını al\n" + +#: cmdline/apt-get.cc:2661 +msgid "Failed to fetch some archives." +msgstr "Bazı arşivler alınamadı." + +#: cmdline/apt-get.cc:2692 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor.\n" + +#: cmdline/apt-get.cc:2704 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "Paket açma komutu '%s' başarısız.\n" + +#: cmdline/apt-get.cc:2705 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" +msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n" + +#: cmdline/apt-get.cc:2727 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "İnşa komutu '%s' başarısız oldu.\n" + +#: cmdline/apt-get.cc:2747 +msgid "Child process failed" +msgstr "Alt süreç başarısız" + +#: cmdline/apt-get.cc:2766 +msgid "Must specify at least one package to check builddeps for" +msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmedilir" + +#: cmdline/apt-get.cc:2791 +#, c-format +msgid "" +"No architecture information available for %s. See apt.conf(5) APT::" +"Architectures for setup" +msgstr "" +"%s mimarisine uygun mimari bilgileri mevcut değil. Kurulumu için apt.conf(5) " +"rehber sayfasındaki APT::Architectures kısmına göz atın." + +#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#, c-format +msgid "Unable to get build-dependency information for %s" +msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor" + +#: cmdline/apt-get.cc:2838 +#, c-format +msgid "%s has no build depends.\n" +msgstr "%s paketinin hiç inşa bağımlılığı yok.\n" + +#: cmdline/apt-get.cc:3008 +#, c-format +msgid "" +"%s dependency for %s can't be satisfied because %s is not allowed on '%s' " +"packages" +msgstr "" +"'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s " +"bağımlılığı karşılanamıyor." + +#: cmdline/apt-get.cc:3026 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı." + +#: cmdline/apt-get.cc:3049 +#, c-format +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni." + +#: cmdline/apt-get.cc:3088 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because candidate version of " +"package %s can't satisfy version requirements" +msgstr "" +"%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü " +"gerekli sürüm şartlarını karşılamıyor" + +#: cmdline/apt-get.cc:3094 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because package %s has no candidate " +"version" +msgstr "" +"%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok" + +#: cmdline/apt-get.cc:3117 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s" + +#: cmdline/apt-get.cc:3133 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "%s için inşa bağımlılıkları karşılanamadı." + +#: cmdline/apt-get.cc:3138 +msgid "Failed to process build dependencies" +msgstr "İnşa bağımlılıklarını işleme başarısız oldu" + +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#, c-format +msgid "Changelog for %s (%s)" +msgstr "%s (%s) paketinin değişim günlüğü" + +#: cmdline/apt-get.cc:3366 +msgid "Supported modules:" +msgstr "Desteklenen birimler:" + +#: cmdline/apt-get.cc:3407 +msgid "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" autoremove - Remove automatically all unused packages\n" +" purge - Remove packages and config files\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +" changelog - Download and display the changelog for the given package\n" +" download - Download the binary package into the current directory\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to correct a system with broken dependencies in place\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" +"Kullanım: apt-get [seçenekler] komut\n" +" apt-get [seçenekler] install|remove paket1 [paket2 ...]\n" +" apt-get [seçenekler] kaynak paket1 [paket2 ...]\n" +"\n" +"apt-get, paket indirmek ve kurmakta kullanılan basit bir komut satırı\n" +"arayüzüdür. En sık kullanılan komutlar güncelleme (update) ve kurma\n" +"(install) komutlarıdır.\n" +"\n" +"Komutlar:\n" +" update - Paket listelerini yenile\n" +" upgrade - Yükseltme işlemini gerçekleştir\n" +" install - Yeni paket kur (paket adı libc6.deb değil libc6 şeklinde " +"olmalıdır)\n" +" remove - Paket(leri) kaldır\n" +" autoremove - Kullanılmayan tüm paketleri otomatik olarak kaldır\n" +" purge - Paketleri ve yapılandırma dosyalarını kaldır\n" +" source - Kaynak paket dosyalarını indir\n" +" build-dep - Kaynak paketlerin inşa bağımlılıklarını yapılandır\n" +" dist-upgrade - Dağıtım yükseltme, ayrıntılı bilgi için apt-get(8)\n" +" dselect-upgrade - dselect yapılandırmalarına uy\n" +" clean - İndirilmiş olan arşiv dosyalarını sil\n" +" autoclean - İndirilmiş olan eski arşiv dosyalarını sil\n" +" check - Eksik bağımlılık olmadığından emin ol\n" +" changelog - Belirtilen paketlerin değişim günlüklerini indir ve " +"görüntüle\n" +" download - İkili paketleri içinde bulunulan dizine indir\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım metni.\n" +" -q Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n" +" -qq Hata olmadığı müddetçe çıktıya bir şey yazma\n" +" -d Yalnızca indir - Paketleri açmaz ve kurmaz\n" +" -s Bir şey yapma. Simülasyon kipinde çalış\n" +" -y Tüm sorulara Evet yanıtını ver ve soru sorma\n" +" -f Eksik bağımlılıklara sahip bir sistemi onarmaya çalış\n" +" -m Eksik paketleri görmezden gel ve işleme devam et\n" +" -u Yükseltilen paketlerin listesini de görüntüle\n" +" -b Kaynak paketi indirdikten sonra inşa et\n" +" -V Sürüm numaralarını daha ayrıntılı göster\n" +" -c=? Belirtilen yapılandırma dosyası kullan\n" +" -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n" +"Ayrıntılı bilgi için apt-get(8), sources.list(5) ve apt.conf(5) rehber\n" +"sayfalarına bakabilirsiniz.\n" +" Bu APT'nin Süper İnek Güçleri vardır.\n" + +#: cmdline/apt-get.cc:3572 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" +"NOT: Bu sadece simülasyondur!\n" +" apt-get sadece root hakları ile gerçekten kullanılabilir.\n" +" Unutmayın ki simülasyonda kilitleme yapılmaz,\n" +" bu nedenle bu simülasyonun tam uygunluğuna güvenmeyin." + +#: cmdline/acqprogress.cc:60 +msgid "Hit " +msgstr "Bağlandı " + +#: cmdline/acqprogress.cc:84 +msgid "Get:" +msgstr "Alınıyor: " + +#: cmdline/acqprogress.cc:115 +msgid "Ign " +msgstr "Yoksay " + +#: cmdline/acqprogress.cc:119 +msgid "Err " +msgstr "Hata " + +#: cmdline/acqprogress.cc:140 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%2$s'de %1$sB alındı (%3$sB/s)\n" + +#: cmdline/acqprogress.cc:230 +#, c-format +msgid " [Working]" +msgstr " [Çalışıyor]" + +#: cmdline/acqprogress.cc:286 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Ortam değişimi: Lütfen '%2$s' sürücüsüne\n" +" '%1$s'\n" +"olarak etiketlenmiş diski takın ve enter tuşuna basın.\n" + +#: cmdline/apt-mark.cc:55 +#, c-format +msgid "%s can not be marked as it is not installed.\n" +msgstr "%s kurulu olmadığı için işaretlenemedi.\n" + +#: cmdline/apt-mark.cc:61 +#, c-format +msgid "%s was already set to manually installed.\n" +msgstr "%s zaten elle kurulmuş olarak ayarlı.\n" + +#: cmdline/apt-mark.cc:63 +#, c-format +msgid "%s was already set to automatically installed.\n" +msgstr "%s zaten otomatik kurulmuş olarak ayarlı.\n" + +#: cmdline/apt-mark.cc:228 +#, c-format +msgid "%s was already set on hold.\n" +msgstr "%s zaten tutulacak şekilde ayarlanmış.\n" + +#: cmdline/apt-mark.cc:230 +#, c-format +msgid "%s was already not hold.\n" +msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n" + +#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 +#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "%s için beklenildi ama o gelmedi" + +#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309 +#, c-format +msgid "%s set on hold.\n" +msgstr "%s paketi tutuluyor.\n" + +#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314 +#, c-format +msgid "Canceled hold on %s.\n" +msgstr "%s paketini tutma işlemi iptal edildi.\n" + +#: cmdline/apt-mark.cc:332 +msgid "Executing dpkg failed. Are you root?" +msgstr "'dpkg' çalıştırılamadı. root olduğunuzdan emin misiniz?" + +#: cmdline/apt-mark.cc:379 +msgid "" +"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +"\n" +"apt-mark is a simple command line interface for marking packages\n" +"as manually or automatically installed. It can also list marks.\n" +"\n" +"Commands:\n" +" auto - Mark the given packages as automatically installed\n" +" manual - Mark the given packages as manually installed\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -s No-act. Just prints what would be done.\n" +" -f read/write auto/manual marking in the given file\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-mark(8) and apt.conf(5) manual pages for more information." +msgstr "" +"Kullanım: apt-mark [seçenekler] {auto|manual} paket1 [paket2 ...]\n" +"\n" +"apt-mark paketleri otomatik ya da elle kurulmuş olarak işaretlemeye\n" +"yarayan basit bir komut satırı arayüzüdür.\n" +"\n" +"Komutlar:\n" +" auto - Belirtilen paketleri otomatik kurulmuş olarak işaretle\n" +" manual - Belirtilen paketleri elle kurulmuş olarak işaretle\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım metni.\n" +" -q Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n" +" -qq Hata olmadığı müddetçe çıktıya bir şey yazma\n" +" -s Bir şey yapma. Yalnızca ne yapılacağını söyler.\n" +" -f read/write auto/manual marking in the given file\n" +" -c=? Belirtilen yapılandırma dosyası kullan\n" +" -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n" +"Ayrıntılı bilgi için apt-mark(8) ve apt.conf(5) rehber sayfalarına\n" +"bakabilirsiniz." + +#: methods/cdrom.cc:203 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "'cdrom' veritabanı %s okunamıyor" + +#: methods/cdrom.cc:212 +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" +"Lütfen bu CD-ROM'un APT tarafından tanınması için apt-cdrom aracını " +"kullanın. apt-get update yeni CD-ROM'lar eklemek için kullanılamaz." + +#: methods/cdrom.cc:222 +msgid "Wrong CD-ROM" +msgstr "Yanlış CD-ROM" + +#: methods/cdrom.cc:249 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "%s konumundaki CD-ROM çıkarılamıyor, hala kullanımda olabilir." + +#: methods/cdrom.cc:254 +msgid "Disk not found." +msgstr "Disk bulunamadı." + +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +msgid "File not found" +msgstr "Dosya bulunamadı" + +#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 +#: methods/rred.cc:512 methods/rred.cc:521 +msgid "Failed to stat" +msgstr "Durum bilgisi okunamadı" + +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +msgid "Failed to set modification time" +msgstr "Değişiklik zamanı ayarlanamadı" + +#: methods/file.cc:47 +msgid "Invalid URI, local URIS must not start with //" +msgstr "Geçersiz URI, yerel URI'ler // ile başlamamalıdır" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:173 +msgid "Logging in" +msgstr "Giriş yapılıyor" + +#: methods/ftp.cc:179 +msgid "Unable to determine the peer name" +msgstr "Eş adı belirlenemiyor" + +#: methods/ftp.cc:184 +msgid "Unable to determine the local name" +msgstr "Yerel ad belirlenemiyor" + +#: methods/ftp.cc:215 methods/ftp.cc:243 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "Sunucu bağlantıyı reddetti, sunucunun iletisi: %s" + +#: methods/ftp.cc:221 +#, c-format +msgid "USER failed, server said: %s" +msgstr "USER başarısız, sunucunun iletisi: %s" + +#: methods/ftp.cc:228 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "PASS başarısız, sunucunun iletisi: %s" + +#: methods/ftp.cc:248 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"Bir Vekil sunucu belirtildi ancak oturum açma betiği belirtilmedi, Acquire::" +"ftp::ProxyLogin boş." + +#: methods/ftp.cc:276 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "Oturum açma betiği komutu '%s' başarısız oldu, sunucunun iletisi: %s" + +#: methods/ftp.cc:302 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "TYPE başarısız, sunucunun iletisi: %s" + +#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +msgid "Connection timeout" +msgstr "Bağlantı zaman aşımına uğradı" + +#: methods/ftp.cc:346 +msgid "Server closed the connection" +msgstr "Sunucu bağlantıyı kesti" + +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 +#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +msgid "Read error" +msgstr "Okuma hatası" + +#: methods/ftp.cc:356 methods/rsh.cc:206 +msgid "A response overflowed the buffer." +msgstr "Bir yanıt arabelleği taşırdı." + +#: methods/ftp.cc:373 methods/ftp.cc:385 +msgid "Protocol corruption" +msgstr "İletişim kuralları bozulması" + +#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 +#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 +#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +msgid "Write error" +msgstr "Yazma hatası" + +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +msgid "Could not create a socket" +msgstr "Bir soket oluşturulamadı" + +#: methods/ftp.cc:707 +msgid "Could not connect data socket, connection timed out" +msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı" + +#: methods/ftp.cc:713 +msgid "Could not connect passive socket." +msgstr "Edilgen sokete bağlanılamadı." + +#: methods/ftp.cc:730 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "getaddrinfo bir dinleme soketi alamıyor" + +#: methods/ftp.cc:744 +msgid "Could not bind a socket" +msgstr "Bir sokete bağlanılamadı" + +#: methods/ftp.cc:748 +msgid "Could not listen on the socket" +msgstr "Soket dinlenemedi" + +#: methods/ftp.cc:755 +msgid "Could not determine the socket's name" +msgstr "Soketin adı belirlenemedi" + +#: methods/ftp.cc:787 +msgid "Unable to send PORT command" +msgstr "PORT komutu gönderilemedi" + +#: methods/ftp.cc:797 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "Bilinmeyen adres ailesi %u (AF_*)" + +#: methods/ftp.cc:806 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "EPRT başarısız, sunucunun iletisi: %s" + +#: methods/ftp.cc:826 +msgid "Data socket connect timed out" +msgstr "Veri soketi bağlantısı zaman aşımına uğradı" + +#: methods/ftp.cc:833 +msgid "Unable to accept connection" +msgstr "Bağlantı kabul edilemiyor" + +#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +msgid "Problem hashing file" +msgstr "Dosya sağlaması yapılamadı" + +#: methods/ftp.cc:885 +#, c-format +msgid "Unable to fetch file, server said '%s'" +msgstr "Dosya alınamıyor, sunucunun iletisi: '%s'" + +#: methods/ftp.cc:900 methods/rsh.cc:330 +msgid "Data socket timed out" +msgstr "Veri soketi zaman aşımına uğradı" + +#: methods/ftp.cc:930 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "Veri aktarımı başarısız, sunucunun iletisi: '%s'" + +#. Get the files information +#: methods/ftp.cc:1007 +msgid "Query" +msgstr "Sorgu" + +#: methods/ftp.cc:1119 +msgid "Unable to invoke " +msgstr "Çağrılamıyor " + +#: methods/connect.cc:75 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "Bağlanılıyor %s (%s)" + +#: methods/connect.cc:86 +#, c-format +msgid "[IP: %s %s]" +msgstr "[IP: %s %s]" + +#: methods/connect.cc:93 +#, c-format +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +msgstr "%s için bir soket oluşturulamadı (f=%u t=%u p=%u)" + +#: methods/connect.cc:99 +#, c-format +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "%s:%s bağlantısı başlatılamıyor (%s)." + +#: methods/connect.cc:107 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "Adrese bağlanılamadı: %s:%s (%s), bağlantı zaman aşımına uğradı" + +#: methods/connect.cc:125 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "Adrese bağlanılamadı: %s:%s (%s)." + +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:153 methods/rsh.cc:433 +#, c-format +msgid "Connecting to %s" +msgstr "Bağlanılıyor: %s" + +#: methods/connect.cc:172 methods/connect.cc:191 +#, c-format +msgid "Could not resolve '%s'" +msgstr "'%s' çözümlenemedi" + +#: methods/connect.cc:197 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "'%s' çözümlenirken geçici bir sorunla karşılaşıldı" + +#: methods/connect.cc:200 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" +msgstr "'%s:%s' (%i - %s) adresi çözümlenirken bir şeyler kötü gitti" + +#: methods/connect.cc:247 +#, c-format +msgid "Unable to connect to %s:%s:" +msgstr "Bağlanılamıyor %s:%s:" + +#: methods/gpgv.cc:180 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "İç hata: İmza iyi, ancak anahtar parmak izi belirlenemedi?!" + +#: methods/gpgv.cc:185 +msgid "At least one invalid signature was encountered." +msgstr "En az bir geçersiz imza ile karşılaşıldı." + +#: methods/gpgv.cc:189 +msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" +msgstr "İmza doğrulama için 'gpgv' çalıştırılamadı (gpgv kurulu mu?)" + +#: methods/gpgv.cc:194 +msgid "Unknown error executing gpgv" +msgstr "gpgv çalıştırılırken bilinmeyen hata" + +#: methods/gpgv.cc:228 methods/gpgv.cc:235 +msgid "The following signatures were invalid:\n" +msgstr "Aşağıdaki imzalar geçersiz:\n" + +#: methods/gpgv.cc:242 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değil:\n" + +#: methods/gzip.cc:65 +msgid "Empty files can't be valid archives" +msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar" + +#: methods/http.cc:394 +msgid "Waiting for headers" +msgstr "Başlıklar bekleniyor" + +#: methods/http.cc:544 +msgid "Bad header line" +msgstr "Kötü başlık satırı" + +#: methods/http.cc:569 methods/http.cc:576 +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP sunucusu geçersiz bir cevap başlığı gönderdi" + +#: methods/http.cc:606 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP sunucusu geçersiz bir Content-Length başlığı gönderdi" + +#: methods/http.cc:621 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP sunucusu geçersiz bir Content-Range başlığı gönderdi" + +#: methods/http.cc:623 +msgid "This HTTP server has broken range support" +msgstr "HTTP sunucusunun aralık desteği bozuk" + +#: methods/http.cc:647 +msgid "Unknown date format" +msgstr "Bilinmeyen tarih biçimi" + +#: methods/http.cc:818 +msgid "Select failed" +msgstr "Seçme başarısız" + +#: methods/http.cc:823 +msgid "Connection timed out" +msgstr "Bağlantı zaman aşımına uğradı" + +#: methods/http.cc:846 +msgid "Error writing to output file" +msgstr "Çıktı dosyasına yazılırken hata" + +#: methods/http.cc:877 +msgid "Error writing to file" +msgstr "Dosyaya yazılamadı" + +#: methods/http.cc:905 +msgid "Error writing to the file" +msgstr "Dosyaya yazılamadı" + +#: methods/http.cc:919 +msgid "Error reading from server. Remote end closed connection" +msgstr "Sunucundan okunurken hata. Uzak sonlu kapalı bağlantı" + +#: methods/http.cc:921 +msgid "Error reading from server" +msgstr "Sunucundan okunurken hata" + +#: methods/http.cc:1194 +msgid "Bad header data" +msgstr "Kötü başlık verisi" + +#: methods/http.cc:1211 methods/http.cc:1266 +msgid "Connection failed" +msgstr "Bağlantı başarısız" + +#: methods/http.cc:1358 +msgid "Internal error" +msgstr "İç hata" + +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 +#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 +#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 +#, c-format +msgid "Unable to read %s" +msgstr "%s okunamıyor" + +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 +#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 +#: apt-pkg/clean.cc:123 +#, c-format +msgid "Unable to change to %s" +msgstr "%s olarak değiştirilemedi" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "'%s' yansı dosyası bulunamadı " + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, c-format +msgid "Can not read mirror file '%s'" +msgstr "Yansı dosyası %s okunamıyor" + +#: methods/mirror.cc:442 +#, c-format +msgid "[Mirror: %s]" +msgstr "[Yansı: %s]" + +#: methods/rred.cc:491 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" +"%s mmap ve dosya işlem kullanımı ile yamalanamadı - yama bozuk gibi duruyor." + +#: methods/rred.cc:496 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" +"%s mmap ile yamalanamadı (mmap'e özel bir hata değil) - yama bozuk gibi " +"duruyor." + +#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Altsürece IPC borusu oluşturulamadı" + +#: methods/rsh.cc:338 +msgid "Connection closed prematurely" +msgstr "Bağlantı vaktinden önce kapandı" + +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "Geçersiz öntanımlı ayar!" + +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 +msgid "Press enter to continue." +msgstr "Devam etmek için giriş (enter) tuşuna basın." + +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Daha önceden indirilmiş .deb dosyalarını silmek istiyor musunuz?" + +#: dselect/install:101 +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "" +"Paket açılırken bazı sorunlar çıktı. Kurulan paketler yapılandırılacak." + +#: dselect/install:102 +msgid "will be configured. This may result in duplicate errors" +msgstr "Bu durum, çift hata iletilerine ya da eksik bağımlılıkların neden" + +#: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"olduğu hatalara yol açabilir. Bu durum bir sorun teşkil etmez, yalnızca bu " +"iletinin" + +#: dselect/install:104 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"üstündeki hatalar önemlidir. Lütfen bunları onarın ve [I]nstall komutunu " +"yeniden çalıştırın" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "Kullanılabilir bilgiler birleştiriliyor" + +#: cmdline/apt-extracttemplates.cc:102 +#, c-format +msgid "%s not a valid DEB package." +msgstr "%s geçerli bir DEB paketi değil." + +#: cmdline/apt-extracttemplates.cc:236 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Kullanım: apt-extracttemplates dosya1 [dosya2 ...]\n" +"\n" +"apt-extracttemplates, Debian paketlerinden ayar ve şablon bilgisini\n" +"almak için kullanılan bir araçtır\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım dosyası\n" +" -t Geçici dizini ayarlar\n" +" -c=? Belirtilen ayar dosyasını kullanır\n" +" -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#, c-format +msgid "Unable to write to %s" +msgstr "%s dosyasına yazılamıyor" + +#: cmdline/apt-extracttemplates.cc:313 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "debconf sürümü alınamıyor. debconf kurulu mu?" + +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +msgid "Package extension list is too long" +msgstr "Paket uzantı listesi çok uzun" + +#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 +#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#, c-format +msgid "Error processing directory %s" +msgstr "%s dizinini işlemede hata" + +#: ftparchive/apt-ftparchive.cc:261 +msgid "Source extension list is too long" +msgstr "Kaynak uzantı listesi çok uzun" + +#: ftparchive/apt-ftparchive.cc:378 +msgid "Error writing header to contents file" +msgstr "İçindekiler dosyasına üstbilgi yazmada hata" + +#: ftparchive/apt-ftparchive.cc:408 +#, c-format +msgid "Error processing contents %s" +msgstr "%s içeriğini işlemede hata" + +#: ftparchive/apt-ftparchive.cc:596 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Kullanım: apt-ftparchive [seçenekler] komut\n" +"Komutlar: packages ikilikonumu [geçersizkılmadosyası [konumöneki]]\n" +" sources kaynakkonumu [geçersizkılmadosyası [konumöneki]]\n" +" contents konum\n" +" release konum\n" +" generate yapılandırma [gruplar]\n" +" clean yapılandırma\n" +"\n" +"apt-ftparchive Debian arşivleri için indeks dosyaları üretir. \n" +"dpkg-scanpackages ve dpkg-scansources için tamamen otomatikten\n" +"işlevsel yedeklere kadar birçok üretim çeşidini destekler.\n" +"\n" +"apt-ftparchive, .deb dizinlerinden 'Package' dosyaları üretir. 'Package'\n" +"dosyası, her paketin MD5 doğrulama ve dosya büyüklüğü gibi denetim\n" +"alanlarının bilgilerini içerir. Öncelik (Priority) ve bölüm (Section)\n" +"değerlerini istenen başka değerlerle değiştirebilmek için bir geçersiz\n" +"kılma dosyası kullanılabilir.\n" +"\n" +"Benzer şekilde, apt-ftparchive, .dscs dosyalarından 'Sources' dosyaları\n" +"üretir. '--source-override' seçeneği bir src geçersiz kılma dosyası\n" +"belirtmek için kullanıabilir.\n" +"\n" +"'packages' ve 'sources' komutları dizin ağacının kökünde çalıştırıl-\n" +"malıdır. BinaryPath özyineli aramanın temeline işaret etmeli ve\n" +"geçersiz kılma dosyası geçersiz kılma bayraklarını içermelidir.\n" +"Pathprefix mevcutsa dosya adı alanlarının sonuna eklenir. Debian\n" +"arşivinden örnek kullanım şu şekildedir:\n" +"\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım metni\n" +" --md5 MD5 üretimini denetle\n" +" -s=? Kaynak geçersiz kılma dosyası\n" +" -q Sessiz\n" +" -d=? Seçimlik önbellek veritabanını seç\n" +" --no-delink Bağlantılanmamış hata ayıklama kipini etkinleştir\n" +" --contents İçerik dosyası üretimini denetle\n" +" -c=? Belirtilen yapılandırma dosyası kullan\n" +" -o=? Yapılandırma seçeneği ayarla" + +#: ftparchive/apt-ftparchive.cc:802 +msgid "No selections matched" +msgstr "Hiçbir seçim eşleşmedi" + +#: ftparchive/apt-ftparchive.cc:880 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik" + +#: ftparchive/cachedb.cc:47 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor" + +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Veritabanı biçimi geçersiz. Eğer apt'ın eski bir sürümünden yükseltme " +"yaptıysanız, lütfen veritabanını silin ve yeniden oluşturun." + +#: ftparchive/cachedb.cc:81 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Veritabanı dosyası %s açılamadı: %s" + +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 +#, c-format +msgid "Failed to stat %s" +msgstr "%s durum bilgisi alınamadı" + +#: ftparchive/cachedb.cc:249 +msgid "Archive has no control record" +msgstr "Arşivin denetim kaydı yok" + +#: ftparchive/cachedb.cc:490 +msgid "Unable to get a cursor" +msgstr "İmleç alınamıyor" + +#: ftparchive/writer.cc:80 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: %s dizini okunamıyor\n" + +#: ftparchive/writer.cc:85 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: %s durum bilgisi alınamıyor\n" + +#: ftparchive/writer.cc:141 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:143 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:150 +msgid "E: Errors apply to file " +msgstr "E: Hatalar şu dosya için geçerli: " + +#: ftparchive/writer.cc:168 ftparchive/writer.cc:200 +#, c-format +msgid "Failed to resolve %s" +msgstr "%s çözümlenemedi" + +#: ftparchive/writer.cc:181 +msgid "Tree walking failed" +msgstr "Ağaçta gezinme başarısız" + +#: ftparchive/writer.cc:208 +#, c-format +msgid "Failed to open %s" +msgstr "%s açılamadı" + +#: ftparchive/writer.cc:267 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" + +#: ftparchive/writer.cc:275 +#, c-format +msgid "Failed to readlink %s" +msgstr "%s bağlantı okuması başarılamadı" + +#: ftparchive/writer.cc:279 +#, c-format +msgid "Failed to unlink %s" +msgstr "%s bağlantı koparma başarılamadı" + +#: ftparchive/writer.cc:286 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** %s, %s konumuna bağlanamadı" + +#: ftparchive/writer.cc:296 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " %sB'lik bağlantı koparma (DeLink) sınırına ulaşıldı.\n" + +#: ftparchive/writer.cc:401 +msgid "Archive had no package field" +msgstr "Arşivde paket alanı yok" + +#: ftparchive/writer.cc:409 ftparchive/writer.cc:711 +#, c-format +msgid " %s has no override entry\n" +msgstr " %s için geçersiz kılma girdisi yok\n" + +#: ftparchive/writer.cc:477 ftparchive/writer.cc:827 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr " %s geliştiricisi %s, %s değil\n" + +#: ftparchive/writer.cc:721 +#, c-format +msgid " %s has no source override entry\n" +msgstr " '%s' paketinin yerine geçecek bir kaynak paket yok\n" + +#: ftparchive/writer.cc:725 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n" + +#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Bellek ayırma yapılamadı" + +#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#, c-format +msgid "Unable to open %s" +msgstr "%s açılamıyor" + +#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#, c-format +msgid "Malformed override %s line %llu #1" +msgstr "Hatalı geçersiz kılma %s satır %llu #1" + +#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Hatalı geçersiz kılma %s satır %llu #2" + +#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Hatalı geçersiz kılma %s satır %llu #3" + +#: ftparchive/override.cc:128 ftparchive/override.cc:202 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Geçersiz kılma dosyası %s okunamadı" + +#: ftparchive/multicompress.cc:70 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Bilinmeyen sıkıştırma algoritması '%s'" + +#: ftparchive/multicompress.cc:100 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır." + +#: ftparchive/multicompress.cc:189 +msgid "Failed to create FILE*" +msgstr "DOSYA* oluşturulamadı" + +#: ftparchive/multicompress.cc:192 +msgid "Failed to fork" +msgstr "fork yapılamadı" + +#: ftparchive/multicompress.cc:206 +msgid "Compress child" +msgstr "Çocuğu sıkıştır" + +#: ftparchive/multicompress.cc:229 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "İç hata, %s oluşturulamadı" + +#: ftparchive/multicompress.cc:304 +msgid "IO to subprocess/file failed" +msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu" + +#: ftparchive/multicompress.cc:342 +msgid "Failed to read while computing MD5" +msgstr "MD5 hesaplanırken okunamadı" + +#: ftparchive/multicompress.cc:358 +#, c-format +msgid "Problem unlinking %s" +msgstr "%s bağı koparılırken sorun çıktı" + +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "%s, %s olarak yeniden adlandırılamadı" + +#: cmdline/apt-internal-solver.cc:37 +msgid "" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Kullanım: apt-internal-solver\n" +"\n" +"apt-internal-solver mevcut dahili çözücüyü (hata ayıklama\n" +"gibi sebeplerle) harici çözücü gibi kullanmaya yarayan bir\n" +"arayüzdür.\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım metni.\n" +" -q Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n" +" -c=? Belirtilen yapılandırma dosyası kullan\n" +" -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Bilinmeyen paket kaydı!" + +#: cmdline/apt-sortpkgs.cc:153 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Kullanım: apt-sortpkgs [seçenekler] dosya1 [dosya2 ...]\n" +"\n" +"apt-sortpkgs, paket dosyalarını sıralayan basit bir araçtır.\n" +"-s seçeneği ne tür bir dosya olduğunu göstermekte kullanılır.\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım metni\n" +" -s Kaynak dosyası sıralamayı kullan\n" +" -c=? Belirtilen yapılandırma dosyasını oku\n" +" -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/" +"tmp\n" + +#: apt-inst/contrib/extracttar.cc:117 +msgid "Failed to create pipes" +msgstr "Boru oluşturulamadı" + +#: apt-inst/contrib/extracttar.cc:144 +msgid "Failed to exec gzip " +msgstr "Gzip çalıştırılamadı " + +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +msgid "Corrupted archive" +msgstr "Bozuk arşiv" + +#: apt-inst/contrib/extracttar.cc:196 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş" + +#: apt-inst/contrib/extracttar.cc:303 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Bilinmeyen TAR başlığı türü %u, üye %s" + +#: apt-inst/contrib/arfile.cc:74 +msgid "Invalid archive signature" +msgstr "Geçersiz arşiv imzası" + +#: apt-inst/contrib/arfile.cc:82 +msgid "Error reading archive member header" +msgstr "Arşiv üyesi başlığı okuma hatası" + +#: apt-inst/contrib/arfile.cc:94 +#, c-format +msgid "Invalid archive member header %s" +msgstr "Geçerşiz arşiv üyesi başlığı %s" + +#: apt-inst/contrib/arfile.cc:106 +msgid "Invalid archive member header" +msgstr "Geçersiz arşiv üyesi başlığı" + +#: apt-inst/contrib/arfile.cc:132 +msgid "Archive is too short" +msgstr "Arşiv çok kısa" + +#: apt-inst/contrib/arfile.cc:136 +msgid "Failed to read the archive headers" +msgstr "Arşiv başlıkları okunamadı" + +#: apt-inst/filelist.cc:382 +msgid "DropNode called on still linked node" +msgstr "DropNode hala bağlı olan düğüm üzerinde çağrıldı" + +#: apt-inst/filelist.cc:414 +msgid "Failed to locate the hash element!" +msgstr "Sağlama elementi bulunamadı" + +#: apt-inst/filelist.cc:461 +msgid "Failed to allocate diversion" +msgstr "Yönlendirme tahsisi başarısız oldu" + +#: apt-inst/filelist.cc:466 +msgid "Internal error in AddDiversion" +msgstr "AddDiversion'da iç hata" + +#: apt-inst/filelist.cc:479 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Bir yönlendirmenin üzerine yazılmaya çalışılıyor, %s -> %s ve %s/%s" + +#: apt-inst/filelist.cc:508 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s" + +#: apt-inst/filelist.cc:551 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "%s/%s yapılandırma dosyası zaten mevcut" + +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#, c-format +msgid "Failed to write file %s" +msgstr "%s dosyasına yazılamadı" + +#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#, c-format +msgid "Failed to close file %s" +msgstr "%s dosyası kapatılamadı" + +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#, c-format +msgid "The path %s is too long" +msgstr "%s yolu çok uzun" + +#: apt-inst/extract.cc:127 +#, c-format +msgid "Unpacking %s more than once" +msgstr "%s paketi bir çok kez açıldı" + +#: apt-inst/extract.cc:137 +#, c-format +msgid "The directory %s is diverted" +msgstr "%s dizini yönlendirilmiş" + +#: apt-inst/extract.cc:147 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Bu paket yönlendirme hedefine (%s/%s) yazmayı deniyor" + +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +msgid "The diversion path is too long" +msgstr "Yönlendirme yolu çok uzun" + +#: apt-inst/extract.cc:243 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "%s dizini dizin olmayan bir öğeyle değiştirildi" + +#: apt-inst/extract.cc:283 +msgid "Failed to locate node in its hash bucket" +msgstr "Düğüm sağlama kovasında bulunamadı" + +#: apt-inst/extract.cc:287 +msgid "The path is too long" +msgstr "Yol çok uzun" + +#: apt-inst/extract.cc:415 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "%s paketinin sürümü yok" + +#: apt-inst/extract.cc:432 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak istiyor" + +#: apt-inst/extract.cc:492 +#, c-format +msgid "Unable to stat %s" +msgstr "%s durum bilgisi alınamadı" + +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Bu dosya geçerli bir DEB arşivi değil, '%s' üyesi eksik" + +#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain +#: apt-inst/deb/debfile.cc:55 +#, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Bu dosya geçerli bir DEB arşivi değil, '%s', '%s' ya da '%s' üyesi yok" + +#: apt-inst/deb/debfile.cc:120 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "İç hata, %s üyesi bulunamadı" + +#: apt-inst/deb/debfile.cc:214 +msgid "Unparsable control file" +msgstr "Ayrıştırılamayan 'control' dosyası" + +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Boş dosya mmap yapılamıyor" + +#: apt-pkg/contrib/mmap.cc:111 +#, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "Dosya tanımlayıcı %i çoğaltılamadı" + +#: apt-pkg/contrib/mmap.cc:119 +#, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "%llu baytlık mmap yapılamaz" + +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "mmap kapatılamıyor" + +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "mmap eşlenemiyor" + +#: apt-pkg/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "%lu baytlık mmap yapılamaz" + +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Dosya kesilemedi" + +#: apt-pkg/contrib/mmap.cc:341 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" +"Dinamik MMap yerine sığamadı. Lütfen APT::Cache-Start boyutunu artırın. " +"Kullanımdaki değer: %lu (ayrıntılı bilgi için man 5 apt.conf komutunu " +"kullanın)" + +#: apt-pkg/contrib/mmap.cc:440 +#, c-format +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "%lu baytlık sınıra ulaşıldığı için MMap boyutu artırılamadı." + +#: apt-pkg/contrib/mmap.cc:443 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Otomatik büyüme kullanıcı tarafından kapatıldığı için MMap boyutu " +"artırılamadı." + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:372 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "%li gün %li saat %li dk. %li sn." + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:379 +#, c-format +msgid "%lih %limin %lis" +msgstr "%li saat %li dk. %li sn." + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:386 +#, c-format +msgid "%limin %lis" +msgstr "%li dk. %li sn." + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:391 +#, c-format +msgid "%lis" +msgstr "%li sn." + +#: apt-pkg/contrib/strutl.cc:1166 +#, c-format +msgid "Selection %s not found" +msgstr "%s seçimi bulunamadı" + +#: apt-pkg/contrib/configuration.cc:491 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Tanınamayan tür kısaltması: '%c'" + +#: apt-pkg/contrib/configuration.cc:605 +#, c-format +msgid "Opening configuration file %s" +msgstr "Yapılandırma dosyası (%s) açılıyor" + +#: apt-pkg/contrib/configuration.cc:773 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Sözdizim hatası %s:%u: Blok ad olmadan başlıyor." + +#: apt-pkg/contrib/configuration.cc:792 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Sözdizim hatası %s:%u: Kötü biçimlendirilmiş etiket" + +#: apt-pkg/contrib/configuration.cc:809 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Sözdizim hatası %s:%u: Değerden sonra ilave gereksiz" + +#: apt-pkg/contrib/configuration.cc:849 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "Sözdizim hatası %s:%u: Yönergeler yalnızca en üst düzeyde bitebilir" + +#: apt-pkg/contrib/configuration.cc:856 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Sözdizim hatası %s:%u: Çok fazla yuvalanmış 'include'" + +#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "Sözdizim hatası %s:%u: Buradan 'include' edilmiş" + +#: apt-pkg/contrib/configuration.cc:869 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Sözdizim hatası %s:%u: Desteklenmeyen yönerge '%s'" + +#: apt-pkg/contrib/configuration.cc:872 +#, c-format +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" +msgstr "" +"Sözdizim hatası %s:%u: clear yönergesi argüman olarak bir seçenek ağacı " +"gerektirir." + +#: apt-pkg/contrib/configuration.cc:922 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Sözdizim hatası %s:%u: Dosya sonunda ilave gereksiz" + +#: apt-pkg/contrib/progress.cc:146 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Hata!" + +#: apt-pkg/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Bitti" + +#: apt-pkg/contrib/cmndline.cc:80 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "Komut satırı seçeneği '%c' [%s içinden] tanınmıyor." + +#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:122 +#, c-format +msgid "Command line option %s is not understood" +msgstr "Komut satırı seçeneği %s anlaşılamadı" + +#: apt-pkg/contrib/cmndline.cc:127 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "Komut satırı seçeneği %s mantıksal değer değil" + +#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189 +#, c-format +msgid "Option %s requires an argument." +msgstr "%s seçeneği bir bağımsız değişkene gerek duyar." + +#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "" +"%s seçeneği: Yapılandırma öğesi tanımlaması = şeklinde değer " +"içermelidir." + +#: apt-pkg/contrib/cmndline.cc:237 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "%s seçeneği bir tam sayı bağımsız değişkene gerek duyar, '%s' değil" + +#: apt-pkg/contrib/cmndline.cc:268 +#, c-format +msgid "Option '%s' is too long" +msgstr "'%s' seçeneği çok uzun" + +#: apt-pkg/contrib/cmndline.cc:300 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "%s algılaması anlaşılamadı, true (doğru) ya da false (yanlış) deneyin." + +#: apt-pkg/contrib/cmndline.cc:350 +#, c-format +msgid "Invalid operation %s" +msgstr "Geçersiz işlem: %s" + +#: apt-pkg/contrib/cdromutl.cc:56 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Bağlama noktasının (%s) durum bilgisi alınamadı" + +#: apt-pkg/contrib/cdromutl.cc:224 +msgid "Failed to stat the cdrom" +msgstr "Cdrom durum bilgisi alınamadı" + +#: apt-pkg/contrib/fileutl.cc:93 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Gzip dosyası %s kapatılamadı" + +#: apt-pkg/contrib/fileutl.cc:225 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Kilitleme dosyası %s salt okunur olduğu için kilitleme kullanılmıyor" + +#: apt-pkg/contrib/fileutl.cc:230 +#, c-format +msgid "Could not open lock file %s" +msgstr "Kilit dosyası %s açılamadı" + +#: apt-pkg/contrib/fileutl.cc:248 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "nfs ile bağlanmış kilit dosyası %s için kilitleme kullanılmıyor" + +#: apt-pkg/contrib/fileutl.cc:252 +#, c-format +msgid "Could not get lock %s" +msgstr "%s kilidi alınamadı" + +#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "'%s' dizin olmadığı için dosya listeli oluşturulamıyor" + +#: apt-pkg/contrib/fileutl.cc:426 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" +"'%2$s' dizinindeki '%1$s' normal bir dosya olmadığı için görmezden geliniyor." + +#: apt-pkg/contrib/fileutl.cc:444 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"'%2$s' dizinindeki '%1$s' dosyası uzantısı olmadığı için görmezden geliniyor." + +#: apt-pkg/contrib/fileutl.cc:453 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"'%2$s' dizinindeki '%1$s' dosyası geçersiz bir dosya uzantısı olduğu için " +"yok sayılıyor." + +#: apt-pkg/contrib/fileutl.cc:840 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "%s altsüreci bir bölümleme hatası aldı (segmentation fault)." + +#: apt-pkg/contrib/fileutl.cc:842 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "%s altsüreci %u sinyali aldı" + +#: apt-pkg/contrib/fileutl.cc:846 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "%s altsüreci bir hata kodu gönderdi (%u)" + +#: apt-pkg/contrib/fileutl.cc:848 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "%s altsüreci beklenmeyen bir şekilde sona erdi" + +#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661 +#, c-format +msgid "Could not open file %s" +msgstr "%s dosyası açılamadı" + +#: apt-pkg/contrib/fileutl.cc:1046 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Dosya tanımlayıcı %d açılamadı" + +#: apt-pkg/contrib/fileutl.cc:1136 +msgid "Failed to create subprocess IPC" +msgstr "Altsüreç IPC'si oluşturulamadı" + +#: apt-pkg/contrib/fileutl.cc:1192 +msgid "Failed to exec compressor " +msgstr "Sıkıştırma programı çalıştırılamadı " + +#: apt-pkg/contrib/fileutl.cc:1289 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "read, %llu bayt okunması gerekli fakat hiç kalmamış" + +#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "write, yazılması gereken %llu bayt yazılamıyor" + +#: apt-pkg/contrib/fileutl.cc:1716 +#, c-format +msgid "Problem closing the file %s" +msgstr "%s dosyası kapatılamadı" + +#: apt-pkg/contrib/fileutl.cc:1728 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "%s dosyası %s olarak yeniden adlandırılamadı" + +#: apt-pkg/contrib/fileutl.cc:1739 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "%s dosyasından bağ kaldırma sorunu" + +#: apt-pkg/contrib/fileutl.cc:1754 +msgid "Problem syncing the file" +msgstr "Dosya eşitlenirken sorun çıktı" + +#: apt-pkg/pkgcache.cc:148 +msgid "Empty package cache" +msgstr "Boş paket önbelleği" + +#: apt-pkg/pkgcache.cc:154 +msgid "The package cache file is corrupted" +msgstr "Paket önbelleği dosyası bozulmuş" + +#: apt-pkg/pkgcache.cc:159 +msgid "The package cache file is an incompatible version" +msgstr "Paket önbelleği dosyası uyumsuz bir sürümde" + +#: apt-pkg/pkgcache.cc:162 +msgid "The package cache file is corrupted, it is too small" +msgstr "Paket önbellek dosyası bozulmuş, çok küçük" + +#: apt-pkg/pkgcache.cc:167 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "Bu APT '%s' sürümleme sistemini desteklemiyor." + +#: apt-pkg/pkgcache.cc:172 +msgid "The package cache was built for a different architecture" +msgstr "Paket önbelleği farklı bir mimarı için yapılmış" + +#: apt-pkg/pkgcache.cc:305 +msgid "Depends" +msgstr "Bağımlılıklar" + +#: apt-pkg/pkgcache.cc:305 +msgid "PreDepends" +msgstr "ÖnBağımlılıklar" + +#: apt-pkg/pkgcache.cc:305 +msgid "Suggests" +msgstr "Önerdikleri" + +#: apt-pkg/pkgcache.cc:306 +msgid "Recommends" +msgstr "Tavsiye ettikleri" + +#: apt-pkg/pkgcache.cc:306 +msgid "Conflicts" +msgstr "Çakışmalar" + +#: apt-pkg/pkgcache.cc:306 +msgid "Replaces" +msgstr "Değiştirilenler" + +#: apt-pkg/pkgcache.cc:307 +msgid "Obsoletes" +msgstr "Eskiyenler" + +#: apt-pkg/pkgcache.cc:307 +msgid "Breaks" +msgstr "Bozdukları" + +#: apt-pkg/pkgcache.cc:307 +msgid "Enhances" +msgstr "Geliştirdikleri" + +#: apt-pkg/pkgcache.cc:318 +msgid "important" +msgstr "önemli" + +#: apt-pkg/pkgcache.cc:318 +msgid "required" +msgstr "gerekli" + +#: apt-pkg/pkgcache.cc:318 +msgid "standard" +msgstr "standart" + +#: apt-pkg/pkgcache.cc:319 +msgid "optional" +msgstr "seçimlik" + +#: apt-pkg/pkgcache.cc:319 +msgid "extra" +msgstr "ilave" + +#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +msgid "Building dependency tree" +msgstr "Bağımlılık ağacı oluşturuluyor" + +#: apt-pkg/depcache.cc:133 +msgid "Candidate versions" +msgstr "Aday sürümler" + +#: apt-pkg/depcache.cc:162 +msgid "Dependency generation" +msgstr "Bağımlılık oluşturma" + +#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +msgid "Reading state information" +msgstr "Durum bilgisi okunuyor" + +#: apt-pkg/depcache.cc:244 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Durum dosyası (StateFile) %s açılamadı." + +#: apt-pkg/depcache.cc:250 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu" + +#: apt-pkg/tagfile.cc:129 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Paket dosyası %s ayrıştırılamadı (1)" + +#: apt-pkg/tagfile.cc:216 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Paket dosyası %s ayrıştırılamadı (2)" + +#: apt-pkg/sourcelist.cc:96 +#, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "" +"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] " +"ayrıştırılamıyor)" + +#: apt-pkg/sourcelist.cc:99 +#, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "" +"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)" + +#: apt-pkg/sourcelist.cc:110 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "" +"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama " +"değil)" + +#: apt-pkg/sourcelist.cc:116 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "" +"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin " +"anahtarı yok)" + +#: apt-pkg/sourcelist.cc:119 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "" +"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s " +"anahtarına değer atanmamış)" + +#: apt-pkg/sourcelist.cc:132 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)" + +#: apt-pkg/sourcelist.cc:134 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)" + +#: apt-pkg/sourcelist.cc:137 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "" +"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)" + +#: apt-pkg/sourcelist.cc:143 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)" + +#: apt-pkg/sourcelist.cc:150 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "" +"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)" + +#: apt-pkg/sourcelist.cc:248 +#, c-format +msgid "Opening %s" +msgstr "%s Açılıyor" + +#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun." + +#: apt-pkg/sourcelist.cc:285 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)" + +#: apt-pkg/sourcelist.cc:289 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)" + +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" +"\"%s\" paketinin anında yapılandırması başarısız oldu. Ayrıntılar için apt." +"conf(5) rehber sayfasının APT::Immediate-Configure kısmına bakın. (%d)" + +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#, c-format +msgid "Could not configure '%s'. " +msgstr "'%s' paketi yapılandırılamadı. " + +#: apt-pkg/packagemanager.cc:545 +#, c-format +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" +"Bu kurulum, bir Çakışma/Ön-Bağımlılık döngüsü içerdiği için %s temel " +"paketinin geçici olarak kaldırılmasını gerektiriyor. Bu durum genellikle " +"kötü bir durumdur, ama ille de devam etmek isterseniz, APT::Force-LoopBreak " +"seçeneğini etkinleştirin." + +#: apt-pkg/pkgrecords.cc:34 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "İndeks dosyası türü '%s' desteklenmiyor" + +#: apt-pkg/algorithms.cc:266 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"%s paketinin tekrar kurulması gerekli, ancak gereken arşiv dosyası " +"bulunamıyor." + +#: apt-pkg/algorithms.cc:1228 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Hata, pkgProblemResolver::Resolve bozuk paketlere yol açtı, bu sorunun " +"nedeni tutulan paketler olabilir." + +#: apt-pkg/algorithms.cc:1230 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var." + +#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +msgid "" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." +msgstr "" +"Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki " +"sürümleri kullanıldı." + +#: apt-pkg/acquire.cc:81 +#, c-format +msgid "List directory %spartial is missing." +msgstr "Liste dizini %spartial bulunamadı." + +#: apt-pkg/acquire.cc:85 +#, c-format +msgid "Archives directory %spartial is missing." +msgstr "Arşiv dizini %spartial bulunamadı." + +#: apt-pkg/acquire.cc:93 +#, c-format +msgid "Unable to lock directory %s" +msgstr "%s dizini kilitlenemiyor" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:893 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Alınan dosya: %li / %li (%s kaldı)" + +#: apt-pkg/acquire.cc:895 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Alınan dosya: %li / %li" + +#: apt-pkg/acquire-worker.cc:112 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Yöntem sürücüsü %s bulunamadı." + +#: apt-pkg/acquire-worker.cc:161 +#, c-format +msgid "Method %s did not start correctly" +msgstr "%s yöntemi düzgün şekilde başlamadı" + +#: apt-pkg/acquire-worker.cc:440 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "" +"Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş " +"(enter) tuşuna basın." + +#: apt-pkg/init.cc:151 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Paketleme sistemi '%s' desteklenmiyor" + +#: apt-pkg/init.cc:167 +msgid "Unable to determine a suitable packaging system type" +msgstr "Uygun bir paketleme sistemi türü bulunamıyor" + +#: apt-pkg/clean.cc:57 +#, c-format +msgid "Unable to stat %s." +msgstr "%s için dosya bilgisi alınamadı." + +#: apt-pkg/srcrecords.cc:47 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız." + +#: apt-pkg/cachefile.cc:87 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Paket listeleri ya da durum dosyası ayrıştırılamadı ya da açılamadı." + +#: apt-pkg/cachefile.cc:91 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Bu sorunları gidermek için apt-get update komutunu çalıştırabilirsiniz." + +#: apt-pkg/cachefile.cc:109 +msgid "The list of sources could not be read." +msgstr "Kaynak listesi okunamadı." + +#: apt-pkg/policy.cc:75 +#, c-format +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" +"APT::Default-Release için '%s' değeri geçersizdir, çünkü kaynaklarda böyle " +"bir sürüm yok." + +#: apt-pkg/policy.cc:399 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "%s tercihler dosyasında geçersiz kayıt, Paket başlığı yok" + +#: apt-pkg/policy.cc:421 +#, c-format +msgid "Did not understand pin type %s" +msgstr "İğne türü %s anlaşılamadı" + +#: apt-pkg/policy.cc:429 +msgid "No priority (or zero) specified for pin" +msgstr "İğne için öncelik belirlenmedi (ya da sıfır)" + +#: apt-pkg/pkgcachegen.cc:87 +msgid "Cache has an incompatible versioning system" +msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var" + +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 +#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 +#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 +#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 +#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 +#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 +#: apt-pkg/pkgcachegen.cc:570 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)" + +#: apt-pkg/pkgcachegen.cc:251 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "Vay canına, bu APT'nin alabileceği paket adları sayısını aştınız." + +#: apt-pkg/pkgcachegen.cc:254 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Vay canına, bu APT'nin alabileceği sürüm sayısını aştınız." + +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Vay canına, bu APT'nin alabileceği açıklama sayısını aştınız." + +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Vay canına, bu APT'nin alabileceği bağımlılık sayısını aştınız." + +#: apt-pkg/pkgcachegen.cc:577 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Dosya bağımlılıkları işlenirken %s %s paketi bulunamadı" + +#: apt-pkg/pkgcachegen.cc:1146 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı" + +#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 +#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +msgid "Reading package lists" +msgstr "Paket listeleri okunuyor" + +#: apt-pkg/pkgcachegen.cc:1251 +msgid "Collecting File Provides" +msgstr "Dosya Sağlananları Toplanıyor" + +#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +msgid "IO Error saving source cache" +msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası" + +#: apt-pkg/acquire-item.cc:139 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "yeniden adlandırma başarısız, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:599 +msgid "MD5Sum mismatch" +msgstr "MD5 toplamı eşleşmiyor" + +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:2002 +msgid "Hash Sum mismatch" +msgstr "Sağlama toplamları eşleşmiyor" + +#: apt-pkg/acquire-item.cc:1370 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" +"'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list " +"dosyasındaki girdi ya da satır hatalı)" + +#: apt-pkg/acquire-item.cc:1386 +#, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı" + +#: apt-pkg/acquire-item.cc:1428 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" +"Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n" + +#: apt-pkg/acquire-item.cc:1466 +#, c-format +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." +msgstr "" +"%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun " +"güncelleştirmeleri uygulanmayacak." + +#: apt-pkg/acquire-item.cc:1488 +#, c-format +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" + +#: apt-pkg/acquire-item.cc:1521 +#, c-format +msgid "" +"A error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used. GPG error: %s: %s\n" +msgstr "" +"İmza doğrulama sırasında bir hata meydana geldi. Depo güncel değil ve önceki " +"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n" + +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536 +#, c-format +msgid "GPG error: %s: %s" +msgstr "GPG hatası: %s: %s" + +#: apt-pkg/acquire-item.cc:1635 +#, 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 paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle " +"düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)" + +#: apt-pkg/acquire-item.cc:1694 +#, 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." +msgstr "" +"%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle " +"düzeltmeniz gerektiği anlamına gelebilir." + +#: apt-pkg/acquire-item.cc:1753 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "Paket indeks dosyaları bozuk. %s paketinin 'Filename:' alanı yok." + +#: apt-pkg/acquire-item.cc:1851 +msgid "Size mismatch" +msgstr "Boyutlar eşleşmiyor" + +#: apt-pkg/indexrecords.cc:64 +#, c-format +msgid "Unable to parse Release file %s" +msgstr "'Release' dosyası (%s) ayrıştırılamadı" + +#: apt-pkg/indexrecords.cc:74 +#, c-format +msgid "No sections in Release file %s" +msgstr "'Release' dosyası %s içinde hiç bölüm yok" + +#: apt-pkg/indexrecords.cc:108 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "'Release' dosyasında (%s) sağlama girdisi yok" + +#: apt-pkg/indexrecords.cc:121 +#, c-format +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "'Release' dosyasında (%s) geçersiz 'Valid-Until' girdisi" + +#: apt-pkg/indexrecords.cc:140 +#, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi" + +#: apt-pkg/vendorlist.cc:78 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "Sağlayıcı bloğu %s parmak izi içermiyor" + +#: apt-pkg/cdrom.cc:576 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" +"CD-ROM bağlama noktası %s kullanılıyor\n" +"CD-ROM bağlanıyor\n" + +#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 +msgid "Identifying.. " +msgstr "Tanımlanıyor... " + +#: apt-pkg/cdrom.cc:613 +#, c-format +msgid "Stored label: %s\n" +msgstr "Kayıtlı etiket: %s\n" + +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM ayrılıyor...\n" + +#: apt-pkg/cdrom.cc:642 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "CD-ROM bağlama noktası %s kullanılıyor\n" + +#: apt-pkg/cdrom.cc:660 +msgid "Unmounting CD-ROM\n" +msgstr "CD-ROM ayrılıyor\n" + +#: apt-pkg/cdrom.cc:665 +msgid "Waiting for disc...\n" +msgstr "Disk bekleniliyor...\n" + +#: apt-pkg/cdrom.cc:674 +msgid "Mounting CD-ROM...\n" +msgstr "CD-ROM bağlanıyor...\n" + +#: apt-pkg/cdrom.cc:693 +msgid "Scanning disc for index files..\n" +msgstr "Disk, indeks dosyaları için taranıyor..\n" + +#: apt-pkg/cdrom.cc:744 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" +"%zu paket indeksi, %zu kaynak indeksi, %zu çeviri indeksi ve %zu imza " +"bulundu\n" + +#: apt-pkg/cdrom.cc:755 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"Hiç paket dosyası bulunamadı. Belirttiğiniz disk bir Debian diski değil ya " +"da yanlış mimariye sahip." + +#: apt-pkg/cdrom.cc:782 +#, c-format +msgid "Found label '%s'\n" +msgstr "'%s' etiketi bulundu\n" + +#: apt-pkg/cdrom.cc:811 +msgid "That is not a valid name, try again.\n" +msgstr "Bu, geçerli bir ad değil, yeniden deneyin.\n" + +#: apt-pkg/cdrom.cc:828 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Disk adı: \n" +"'%s'\n" + +#: apt-pkg/cdrom.cc:830 +msgid "Copying package lists..." +msgstr "Paket listeleri kopyalanıyor.." + +#: apt-pkg/cdrom.cc:857 +msgid "Writing new source list\n" +msgstr "Yeni kaynak listesi yazılıyor\n" + +#: apt-pkg/cdrom.cc:865 +msgid "Source list entries for this disc are:\n" +msgstr "Bu disk için olan kaynak listesi girdileri:\n" + +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884 +#, c-format +msgid "Wrote %i records.\n" +msgstr "%i kayıt yazıldı.\n" + +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "%2$i eksik dosyayla %1$i kayıt yazıldı.\n" + +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%2$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n" + +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "%2$i eksik dosya ve %3$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n" + +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "%s için kimlik doğrulama kaydı bulunamadı." + +#: apt-pkg/indexcopy.cc:521 +#, c-format +msgid "Hash mismatch for: %s" +msgstr "Sağlama yapılamadı: %s" + +#: apt-pkg/indexcopy.cc:665 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "%s dosyası açıkimzalı bir iletiyle başlamıyor" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:696 +#, c-format +msgid "No keyring installed in %s." +msgstr "%s dizininde kurulu bir anahtar yok." + +#: apt-pkg/cacheset.cc:403 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" + +#: apt-pkg/cacheset.cc:406 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" + +#: apt-pkg/cacheset.cc:517 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "'%s' görevi bulunamadı" + +#: apt-pkg/cacheset.cc:523 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı" + +#: apt-pkg/cacheset.cc:534 +#, c-format +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "'%s' paketi tamamen sanal olduğu için sürümü seçilemiyor" + +#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de " +"seçilemiyor" + +#: apt-pkg/cacheset.cc:555 +#, c-format +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "'%s' paketi sanal olduğu için en yeni sürümü seçilemiyor" + +#: apt-pkg/cacheset.cc:563 +#, c-format +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "'%s' paketinin aday sürümü olmadığı için aday sürüm seçilemiyor" + +#: apt-pkg/cacheset.cc:571 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "'%s' paketi kurulu olmadığı için kurulu sürüm seçilemiyor" + +#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +msgid "Send scenario to solver" +msgstr "Çözücüye senaryo gönder" + +#: apt-pkg/edsp.cc:209 +msgid "Send request to solver" +msgstr "Çözücüye istek gönder" + +#: apt-pkg/edsp.cc:279 +msgid "Prepare for receiving solution" +msgstr "Çözüm almak için hazırlan" + +#: apt-pkg/edsp.cc:286 +msgid "External solver failed without a proper error message" +msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu" + +#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +msgid "Execute external solver" +msgstr "Harici çözücüyü çalıştır" + +#: apt-pkg/deb/dpkgpm.cc:73 +#, c-format +msgid "Installing %s" +msgstr "%s kuruluyor" + +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#, c-format +msgid "Configuring %s" +msgstr "%s yapılandırılıyor" + +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#, c-format +msgid "Removing %s" +msgstr "%s kaldırılıyor" + +#: apt-pkg/deb/dpkgpm.cc:76 +#, c-format +msgid "Completely removing %s" +msgstr "%s tamamen kaldırılıyor" + +#: apt-pkg/deb/dpkgpm.cc:77 +#, c-format +msgid "Noting disappearance of %s" +msgstr "%s paketinin kaybolduğu not ediliyor" + +#: apt-pkg/deb/dpkgpm.cc:78 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor" + +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:705 +#, c-format +msgid "Directory '%s' missing" +msgstr "'%s' dizini bulunamadı" + +#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#, c-format +msgid "Could not open file '%s'" +msgstr "'%s' dosyası açılamadı" + +#: apt-pkg/deb/dpkgpm.cc:945 +#, c-format +msgid "Preparing %s" +msgstr "%s hazırlanıyor" + +#: apt-pkg/deb/dpkgpm.cc:946 +#, c-format +msgid "Unpacking %s" +msgstr "%s paketi açılıyor" + +#: apt-pkg/deb/dpkgpm.cc:951 +#, c-format +msgid "Preparing to configure %s" +msgstr "%s paketini yapılandırmaya hazırlanılıyor" + +#: apt-pkg/deb/dpkgpm.cc:953 +#, c-format +msgid "Installed %s" +msgstr "%s kuruldu" + +#: apt-pkg/deb/dpkgpm.cc:958 +#, c-format +msgid "Preparing for removal of %s" +msgstr "%s paketinin kaldırılmasına hazırlanılıyor" + +#: apt-pkg/deb/dpkgpm.cc:960 +#, c-format +msgid "Removed %s" +msgstr "%s kaldırıldı" + +#: apt-pkg/deb/dpkgpm.cc:965 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor" + +#: apt-pkg/deb/dpkgpm.cc:966 +#, c-format +msgid "Completely removed %s" +msgstr "%s tamamen kaldırıldı" + +#: apt-pkg/deb/dpkgpm.cc:1213 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Günlük yazılamadı, openpty() başarısız oldu (/dev/pts bağlanmadı mı?)\n" + +#: apt-pkg/deb/dpkgpm.cc:1243 +msgid "Running dpkg" +msgstr "dpkg çalıştırılıyor" + +#: apt-pkg/deb/dpkgpm.cc:1415 +msgid "Operation was interrupted before it could finish" +msgstr "İşlem yarıda kesildi" + +#: apt-pkg/deb/dpkgpm.cc:1477 +msgid "No apport report written because MaxReports is reached already" +msgstr "" +"En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1482 +msgid "dependency problems - leaving unconfigured" +msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor" + +#: apt-pkg/deb/dpkgpm.cc:1484 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" +"Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan " +"kaynaklanan bir hata olduğunu belirtiyor." + +#: apt-pkg/deb/dpkgpm.cc:1490 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" +"Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" + +#: apt-pkg/deb/dpkgpm.cc:1496 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" +"Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport " +"raporu yazılamadı" + +#: apt-pkg/deb/dpkgpm.cc:1503 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" +"Hata iletisi bir dpkg G/Ç hatasına işaret ettiği için apport raporu " +"yazılamadı" + +#: apt-pkg/deb/debsystem.cc:84 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Yönetim dizini (%s) kilitlenemiyor, başka bir işlem tarafından kullanılıyor " +"olmasın?" + +#: apt-pkg/deb/debsystem.cc:87 +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Yönetim dizini (%s) kilitlenemiyor, root kullanıcısı mısınız?" + +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:103 +#, c-format +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" +"dpkg kesintiye uğradı, sorunu düzeltmek için elle '%s' komutunu çalıştırın. " + +#: apt-pkg/deb/debsystem.cc:121 +msgid "Not locked" +msgstr "Kilitlenmemiş" -- cgit v1.2.3 From 45d02095cbd425c741b69810f91bc2282bf9230b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 22 Mar 2013 21:46:53 +0100 Subject: add new config options "Acquire::ForceIPv4" and "Acquire::ForceIPv6" to allow focing one or the other (closes: #611891) --- debian/changelog | 5 +++++ methods/connect.cc | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index a4a0b4c6d..4c830afe9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,11 @@ apt (0.9.7.8~exp3) UNRELEASEDexperimental; urgency=low * methods/connect.cc: - provide useful error message in case of EAI_SYSTEM (closes: #703603) + + [ Michael Vogt ] + * add new config options "Acquire::ForceIPv4" and + "Acquire::ForceIPv6" to allow focing one or the other + (closes: #611891) -- Michael Vogt Sun, 17 Mar 2013 19:46:23 +0100 diff --git a/methods/connect.cc b/methods/connect.cc index 3573d3cbf..35f4723ce 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -167,6 +168,13 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd, Hints.ai_flags = AI_ADDRCONFIG; Hints.ai_protocol = 0; + if(_config->FindB("Acquire::ForceIPv4", false) == true) + Hints.ai_family = AF_INET; + else if(_config->FindB("Acquire::ForceIPv6", false) == true) + Hints.ai_family = AF_INET6; + else + Hints.ai_family = AF_UNSPEC; + // if we couldn't resolve the host before, we don't try now if(bad_addr.find(Host) != bad_addr.end()) return _error->Error(_("Could not resolve '%s'"),Host.c_str()); -- cgit v1.2.3 From d89af4b06f6f7690bde54998e4a0e4c57d152edb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 22 Mar 2013 21:53:30 +0100 Subject: prepare upload --- debian/changelog | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59f01c5d6..27b266ee2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,4 @@ -apt (0.9.7.8) unstable; urgency=criticial - - * SECURITY UPDATE: InRelease verification bypass - - CVE-2013-1051 - - [ David Kalnischk ] - * apt-pkg/deb/debmetaindex.cc, - test/integration/test-bug-595691-empty-and-broken-archive-files, - test/integration/test-releasefile-verification: - - disable InRelease downloading until the verification issue is - fixed, thanks to Ansgar Burchardt for finding the flaw - - -- Michael Vogt Thu, 14 Mar 2013 07:47:36 +0100 - -apt (0.9.7.8~exp3) UNRELEASEDexperimental; urgency=low +apt (0.9.7.9~exp1) experimental; urgency=low [ Niels Thykier ] * test/libapt/assert.h, test/libapt/run-tests: @@ -40,7 +26,21 @@ apt (0.9.7.8~exp3) UNRELEASEDexperimental; urgency=low - this will require rebuilds of the clients as this used to be a inline function - -- Michael Vogt Sun, 17 Mar 2013 19:46:23 +0100 + -- Michael Vogt Fri, 22 Mar 2013 21:53:15 +0100 + +apt (0.9.7.8) unstable; urgency=criticial + + * SECURITY UPDATE: InRelease verification bypass + - CVE-2013-1051 + + [ David Kalnischk ] + * apt-pkg/deb/debmetaindex.cc, + test/integration/test-bug-595691-empty-and-broken-archive-files, + test/integration/test-releasefile-verification: + - disable InRelease downloading until the verification issue is + fixed, thanks to Ansgar Burchardt for finding the flaw + + -- Michael Vogt Thu, 14 Mar 2013 07:47:36 +0100 apt (0.9.7.8~exp2) experimental; urgency=low -- cgit v1.2.3 From 46974861750d556ef62d13dad53f86411d296842 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 22 Mar 2013 22:10:02 +0100 Subject: releasing version 0.9.7.9~exp1 --- configure.in | 2 +- debian/changelog | 2 +- doc/apt-verbatim.ent | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index fa10058ef..b2414e649 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.7.8~20130109" +PACKAGE_VERSION="0.9.7.9~exp1" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index 27b266ee2..a25507fc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,7 +26,7 @@ apt (0.9.7.9~exp1) experimental; urgency=low - this will require rebuilds of the clients as this used to be a inline function - -- Michael Vogt Fri, 22 Mar 2013 21:53:15 +0100 + -- Michael Vogt Fri, 22 Mar 2013 21:57:08 +0100 apt (0.9.7.8) unstable; urgency=criticial diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index f3885ef7c..7bc82695f 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -213,7 +213,7 @@ "> - + -- cgit v1.2.3 From 1f73a3d88966c833a17b06d5565f1bac4651a432 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 24 Mar 2013 08:54:14 +0100 Subject: Update POT and PO files --- po/apt-all.pot | 75 +++++++++++------- po/ar.po | 73 ++++++++++------- po/ast.po | 73 ++++++++++------- po/bg.po | 73 ++++++++++------- po/bs.po | 73 ++++++++++------- po/ca.po | 245 ++++++++++++++++++++++++++++++--------------------------- po/cs.po | 245 ++++++++++++++++++++++++++++++--------------------------- po/cy.po | 73 ++++++++++------- po/da.po | 73 ++++++++++------- po/de.po | 73 ++++++++++------- po/dz.po | 73 ++++++++++------- po/el.po | 73 ++++++++++------- po/es.po | 73 ++++++++++------- po/eu.po | 73 ++++++++++------- po/fi.po | 73 ++++++++++------- po/fr.po | 75 +++++++++++------- po/gl.po | 73 ++++++++++------- po/hu.po | 73 ++++++++++------- po/it.po | 74 ++++++++++------- po/ja.po | 245 ++++++++++++++++++++++++++++++--------------------------- po/km.po | 73 ++++++++++------- po/ko.po | 73 ++++++++++------- po/ku.po | 73 ++++++++++------- po/lt.po | 73 ++++++++++------- po/mr.po | 73 ++++++++++------- po/nb.po | 73 ++++++++++------- po/ne.po | 73 ++++++++++------- po/nl.po | 73 ++++++++++------- po/nn.po | 73 ++++++++++------- po/pl.po | 73 ++++++++++------- po/pt.po | 73 ++++++++++------- po/pt_BR.po | 73 ++++++++++------- po/ro.po | 73 ++++++++++------- po/ru.po | 245 ++++++++++++++++++++++++++++++--------------------------- po/sk.po | 73 ++++++++++------- po/sl.po | 73 ++++++++++------- po/sv.po | 74 ++++++++++------- po/th.po | 73 ++++++++++------- po/tl.po | 73 ++++++++++------- po/uk.po | 73 ++++++++++------- po/vi.po | 73 ++++++++++------- po/zh_CN.po | 73 ++++++++++------- po/zh_TW.po | 73 ++++++++++------- 43 files changed, 2245 insertions(+), 1588 deletions(-) diff --git a/po/apt-all.pot b/po/apt-all.pot index 690908054..fd772e275 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 0.9.7.8\n" +"Project-Id-Version: apt 0.9.7.9~exp1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -569,7 +569,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -743,7 +743,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "" @@ -1244,7 +1244,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "" @@ -1271,59 +1271,64 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "" @@ -1387,43 +1392,43 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "" @@ -2153,6 +2158,16 @@ msgstr "" msgid "%c%s... Done" msgstr "" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2539,17 +2554,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3001,7 +3016,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/ar.po b/po/ar.po index 010860af2..7c9ea1d11 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -582,7 +582,7 @@ msgstr "إجهاض." msgid "Do you want to continue [Y/n]? " msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" @@ -761,7 +761,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "فشل" @@ -1269,7 +1269,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "" @@ -1296,59 +1296,64 @@ msgstr "استعلام" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "الاتصال بـ%s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "تعذر الاتصال بـ%s %s:" @@ -1412,43 +1417,43 @@ msgstr "خادم http له دعم مدى معطوب" msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "خطأ داخلي" @@ -2183,6 +2188,16 @@ msgstr "%c%s... خطأ!" msgid "%c%s... Done" msgstr "%c%s... تمّ" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... تمّ" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2570,17 +2585,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3036,7 +3051,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/ast.po b/po/ast.po index df41c82cc..908155a66 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -628,7 +628,7 @@ msgstr "Encaboxar." msgid "Do you want to continue [Y/n]? " msgstr "¿Quies continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" @@ -820,7 +820,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Calculando l'anovamientu... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Falló" @@ -1396,7 +1396,7 @@ msgstr "Gandió'l tiempu de conexón col zócalu de datos" msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexón" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" @@ -1423,59 +1423,64 @@ msgstr "Consulta" msgid "Unable to invoke " msgstr "Nun se pudo invocar " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Coneutando a %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nun se pudo crear un socket pa %s (f=%u t=%u p=%u)" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nun se pudo coneutar a %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nun se pudo coneutar a %s:%s (%s); expiró'l tiempu de conexón" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nun se pudo coneutar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Coneutando a %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Nun se pudo resolver '%s'" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallu temporal al resolver '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Nun pudo coneutase a %s:%s:" @@ -1542,43 +1547,43 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" msgid "Unknown date format" msgstr "Formatu de data desconocíu" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Falló la escoyeta" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Gandió'l tiempu de conexón" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón." -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Fallo la conexón" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Fallu internu" @@ -2400,6 +2405,16 @@ msgstr "%c%s... ¡Fallu!" msgid "%c%s... Done" msgstr "%c%s... Fecho" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Fecho" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2796,7 +2811,7 @@ msgid "" msgstr "" "El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2804,11 +2819,11 @@ msgstr "" "Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola " "mor de paquetes reteníos." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3292,7 +3307,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/bg.po b/po/bg.po index dfcebd630..f43ae7530 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -638,7 +638,7 @@ msgstr "Прекъсване." msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" @@ -831,7 +831,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Неуспех" @@ -1430,7 +1430,7 @@ msgstr "Времето за установяване на връзка с гне msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -1457,59 +1457,64 @@ msgstr "Запитване" msgid "Unable to invoke " msgstr "Неуспех при извикването на " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Свързване с %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Не може да се започне свързване с %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Свързване с %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Неуспех при намирането на IP адреса на „%s“" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Временен неуспех при намирането на IP адреса на „%s“" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Неуспех при свързване с %s:%s:" @@ -1579,43 +1584,43 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Вътрешна грешка" @@ -2438,6 +2443,16 @@ msgstr "%c%s... Грешка!" msgid "%c%s... Done" msgstr "%c%s... Готово" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Готово" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2843,7 +2858,7 @@ msgstr "" "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " "него." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2851,12 +2866,12 @@ msgstr "" "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " "причинено от задържани пакети." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3349,7 +3364,7 @@ msgstr "" "Външната програма за удовлетворяване на зависимости се провали без да изведе " "съобщение за грешка" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Изпълняване на външна програма за удовлетворяване на зависимости" diff --git a/po/bs.po b/po/bs.po index 92371278a..bce21d794 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -587,7 +587,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Neuspješno" @@ -1266,7 +1266,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "" @@ -1293,59 +1293,64 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Povezujem se sa %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ne mogu se povezati sa %s %s:" @@ -1410,43 +1415,43 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Unutrašnja greška" @@ -2180,6 +2185,16 @@ msgstr "" msgid "%c%s... Done" msgstr "" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2568,17 +2583,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3033,7 +3048,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/ca.po b/po/ca.po index e582886b0..41488ba3c 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr " Taula de versió:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -487,7 +487,7 @@ msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n" msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instaŀlat manualment.\n" @@ -599,8 +599,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@ -610,15 +610,17 @@ msgstr "No s'ha pogut determinar l'espai lliure en %s" msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -629,28 +631,28 @@ msgstr "" "Per continuar escriviu la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Avortat." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut baixar" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Baixada completa i en mode de només baixada" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -658,19 +660,19 @@ msgstr "" "No es poden baixar alguns arxius, proveu a executar apt-get update o " "intenteu-ho amb --fix-missing." -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i els medi intercanviables actualment no estan suportats" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "S'està avortant la instaŀlació." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -684,37 +686,37 @@ msgstr[1] "" "Els següents paquets han desaparegut del vostre sistema ja\n" "que tots els fitxers s'han sobreescrit per altres paquets:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignora la versió objectiu «%s» no disponible del paquet «%s»" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Descarta la versió «%s» no disponible del paquet «%s»" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor " "automàtic" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -732,15 +734,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "La informació següent pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -751,7 +753,7 @@ msgstr[0] "" msgstr[1] "" "Els paquets següents s'han instaŀlat automàticament i ja no són necessaris:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -761,21 +763,21 @@ msgstr[0] "" msgstr[1] "" "Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Empreu «apt-get autoremove» per a suprimir-lo." msgstr[1] "Empreu «apt-get autoremove» per a suprimir-los." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -783,7 +785,7 @@ msgstr "" "Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -795,33 +797,33 @@ msgstr "" "«unstable» i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han introduït des d'«Incoming»." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "S'instaŀlaran els següents paquets extres:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "S'ha marcat %s com instaŀlat automàticament.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -829,47 +831,47 @@ msgstr "" "Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» " "en el seu lloc." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització… " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 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:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "No es troba una font per baixar la versió «%s» de «%s»" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "S'està baixant %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, 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:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -879,7 +881,7 @@ msgstr "" "versions «%s» a:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -891,71 +893,71 @@ msgstr "" "per obtenir les últimes actualitzacions (possiblement no publicades) del " "paquet.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Obtén el font %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -964,18 +966,18 @@ msgstr "" "No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) " "APT::Architectures per a configurar-ho" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, 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:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -984,7 +986,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè %s no és permès als " "paquets «%s»" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -993,14 +995,14 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet " "%s" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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 instaŀlat %s és " "massa nou" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1009,7 +1011,7 @@ msgstr "" "La dependència %s per a %s no es pot satisfer perquè la versió candidata del " "paquet %s no pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1018,30 +1020,30 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió " "candidata" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, 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:3133 +#: cmdline/apt-get.cc:3135 #, 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:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Registre de canvis per a %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1133,7 +1135,7 @@ msgstr "" "per a obtenir més informació i opcions.\n" " Aquest APT té superpoders bovins.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1416,7 +1418,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1443,59 +1445,64 @@ msgstr "Consulta" msgid "Unable to invoke " msgstr "No es pot invocar" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "S'està connectant amb %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, 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:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "S'està connectant amb %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "No s'ha pogut resoldre «%s»" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "S'ha produït un error temporal en resoldre «%s»" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "No es pot connectar amb %s:%s:" @@ -1565,44 +1572,44 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat" msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "" "S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Error intern" @@ -1738,7 +1745,7 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@ -2421,6 +2428,16 @@ msgstr "%c%s… Error!" msgid "%c%s... Done" msgstr "%c%s… Fet" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… Fet" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2784,7 +2801,7 @@ msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2793,12 +2810,12 @@ msgstr "" "No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt." "conf, sota APT::Immediate-Configure per a més detalls. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "No s'ha pogut configurar «%s»." -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2822,7 +2839,7 @@ msgid "" msgstr "" "El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2830,13 +2847,13 @@ msgstr "" "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " "causat per paquets retinguts." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2988,21 +3005,21 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" @@ -3335,7 +3352,7 @@ msgstr "Prepara per a rebre una solució" msgid "External solver failed without a proper error message" msgstr "El resoledor extern ha fallat sense un missatge d'error adient" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Executa un resoledor extern" diff --git a/po/cs.po b/po/cs.po index 4ccb2f70b..cb260c621 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -153,7 +153,7 @@ msgid " Version table:" msgstr " Tabulka verzí:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -478,7 +478,7 @@ msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n" msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" @@ -586,8 +586,8 @@ msgstr "Po této operaci bude na disku použito dalších %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po této operaci bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nelze určit volné místo v %s" @@ -597,15 +597,17 @@ msgstr "Nelze určit volné místo v %s" msgid "You don't have enough free space in %s." msgstr "V %s nemáte dostatek volného místa." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -616,28 +618,28 @@ msgstr "" "Pro pokračování opište frázi „%s“\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Přerušeno." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -645,19 +647,19 @@ msgstr "" "Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --" "fix-missing?" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Nelze opravit chybějící balíky." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Přerušuji instalaci." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -674,35 +676,35 @@ msgstr[2] "" "Následující balíky z tohoto systému zmizely, protože\n" "všechny jejich soubory byly přepsány jinými balíky:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Ignoruje se nedostupné vydání „%s“ balíku „%s“" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Vybírám „%s“ jako zdrojový balík místo „%s“\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Ignoruje se nedostupná verze „%s“ balíku „%s“" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -720,15 +722,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnitřní chyba, AutoRemover pokazil věci" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -740,7 +742,7 @@ msgstr[1] "" msgstr[2] "" "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -749,22 +751,22 @@ msgstr[0] "%lu balík byl nainstalován automaticky a již není potřeba.\n" msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n" msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Pro jeho odstranění použijte „apt-get autoremove“." msgstr[1] "Pro jejich odstranění použijte „apt-get autoremove“." msgstr[2] "Pro jejich odstranění použijte „apt-get autoremove“." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 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:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -772,7 +774,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -783,33 +785,33 @@ 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:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Nelze najít balík %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s nastaven jako instalovaný automaticky.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -817,46 +819,46 @@ msgstr "" "Tento příkaz je zastaralý, použijte místo něj „apt-mark auto“ a „apt-mark " "manual“." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci… " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Nelze zamknout adresář pro stahování" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Stahuje se %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 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:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Nelze najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -865,7 +867,7 @@ msgstr "" "INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -876,70 +878,70 @@ msgstr "" "použijte:\n" "bzr branch %s\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, 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:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Stažení zdroje %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, 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:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, 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:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 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:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -948,17 +950,17 @@ msgstr "" "O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte " "část APT::Architectures v manuálové stránce apt.conf(5)" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nelze získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -967,20 +969,20 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ " "dovolena" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -989,7 +991,7 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s " "nesplňuje požadavek na verzi" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -998,30 +1000,30 @@ msgstr "" "závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou " "verzi" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění závislosti %s pro %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, 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:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Seznam změn %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1108,7 +1110,7 @@ msgstr "" "a apt.conf(5).\n" " Tato APT má schopnosti svaté krávy.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1408,7 +1410,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nelze přijmout spojení" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problém s kontrolním součtem souboru" @@ -1435,59 +1437,64 @@ msgstr "Dotaz" msgid "Unable to invoke " msgstr "Nelze vyvolat " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Připojuji se k %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nelze vytvořit socket pro %s (f=%u t=%u p=%u)" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nelze navázat spojení na %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nelze se připojit k %s:%s (%s), čas spojení vypršel" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nelze 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Připojuji se k %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Nelze přeložit „%s“" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Dočasné selhání při zjišťování „%s“" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Nelze se připojit k %s:%s:" @@ -1553,43 +1560,43 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Vnitřní chyba" @@ -1719,7 +1726,7 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Nelze zapsat do %s" @@ -2399,6 +2406,16 @@ msgstr "%c%s… Chyba!" msgid "%c%s... Done" msgstr "%c%s… Hotovo" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… Hotovo" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2754,7 +2771,7 @@ msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2763,12 +2780,12 @@ msgstr "" "Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man " "5 apt.conf v části APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Nelze nastavit „%s“." -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2790,7 +2807,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2798,11 +2815,11 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " "podrženými balíky." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2946,21 +2963,21 @@ msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracov msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Čtu seznamy balíků" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" @@ -3280,7 +3297,7 @@ msgstr "Příprava na obdržení řešení" msgid "External solver failed without a proper error message" msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Spuštění externího řešitele" diff --git a/po/cy.po b/po/cy.po index d519064f4..3e684a489 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -663,7 +663,7 @@ msgstr "Erthylu." msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" @@ -852,7 +852,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Methwyd" @@ -1422,7 +1422,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -1450,59 +1450,64 @@ msgstr "Ymholiad" msgid "Unable to invoke " msgstr "Methwyd gweithredu " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Methwyd datrys '%s'" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" @@ -1571,45 +1576,45 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:919 +#: methods/http.cc:923 #, 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:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1194 +#: methods/http.cc:1198 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Gwall mewnol" @@ -2435,6 +2440,16 @@ msgstr "%c%s... Gwall!" msgid "%c%s... Done" msgstr "%c%s... Wedi Gorffen" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Wedi Gorffen" + # FIXME #: apt-pkg/contrib/cmndline.cc:80 #, c-format @@ -2843,7 +2858,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2851,12 +2866,12 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3336,7 +3351,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/da.po b/po/da.po index fe982be16..4ca0c0711 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-07-03 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -635,7 +635,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -829,7 +829,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Mislykkedes" @@ -1418,7 +1418,7 @@ msgstr "Tidsudløb på datasokkel-forbindelse" msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1445,59 +1445,64 @@ msgstr "Forespørgsel" msgid "Unable to invoke " msgstr "Kunne ikke udføre " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Forbinder til %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan ikke oprette forbindelse til %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Forbinder til %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Kunne ikke omsætte navnet '%s'" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig fejl ved omsætning af navnet '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Kunne ikke forbinde til %s:%s:" @@ -1566,43 +1571,43 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Intern fejl" @@ -2421,6 +2426,16 @@ msgstr "%c%s... Fejl!" msgid "%c%s... Done" msgstr "%c%s... Færdig" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Færdig" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2814,7 +2829,7 @@ msgid "" msgstr "" "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2822,12 +2837,12 @@ msgstr "" "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " "tilbageholdte pakker." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3308,7 +3323,7 @@ msgstr "Forbered for modtagelse af løsning" msgid "External solver failed without a proper error message" msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Kør ekstern problemløser" diff --git a/po/de.po b/po/de.po index b78679a6b..604696146 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -648,7 +648,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" @@ -847,7 +847,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Paketaktualisierung (Upgrade) wird berechnet... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Fehlgeschlagen" @@ -1462,7 +1462,7 @@ msgstr "Zeitüberschreitung bei Datenverbindungsaufbau" msgid "Unable to accept connection" msgstr "Verbindung konnte nicht angenommen werden." -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problem bei Bestimmung des Hashwertes einer Datei" @@ -1489,61 +1489,66 @@ msgstr "Abfrage" msgid "Unable to invoke " msgstr "Aufruf nicht möglich: " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Verbindung mit %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Socket für %s konnte nicht erzeugt werden (f=%u t=%u p=%u)." -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Verbindung mit %s:%s kann nicht aufgebaut werden (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Verbindung mit %s:%s konnte nicht aufgebaut werden (%s), eine " "Zeitüberschreitung trat auf." -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Verbindung mit %s:%s nicht möglich (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Verbindung mit %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "»%s« konnte nicht aufgelöst werden." -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporärer Fehlschlag beim Auflösen von »%s«" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)." + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)." -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Verbindung mit %s:%s nicht möglich:" @@ -1617,45 +1622,45 @@ msgstr "" msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Zeitüberschreitung bei Verbindung" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Fehler beim Schreiben der Ausgabedatei" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Fehler beim Schreiben in Datei" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der " "anderen Seite geschlossen." -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Interner Fehler" @@ -2484,6 +2489,16 @@ msgstr "%c%s... Fehler!" msgid "%c%s... Done" msgstr "%c%s... Fertig" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Fertig" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2890,7 +2905,7 @@ msgstr "" "Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür " "gefunden werden." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2898,13 +2913,13 @@ msgstr "" "Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; " "dies könnte durch zurückgehaltene Pakete verursacht worden sein." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte " "Pakete." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3411,7 +3426,7 @@ msgid "External solver failed without a proper error message" msgstr "" "Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen." -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Externen Problemlöser ausführen" diff --git a/po/dz.po b/po/dz.po index c6eea92bd..dd9947476 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -645,7 +645,7 @@ msgstr "བར་བཤོལ་འབད།" msgid "Do you want to continue [Y/n]? " msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" @@ -828,7 +828,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" @@ -1384,7 +1384,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" @@ -1411,59 +1411,64 @@ msgstr "འདྲི་དཔྱད།" msgid "Unable to invoke " msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s)ལུ་མཐུད་ལམ་དེ་འགོ་འབྱེད་འབད་མ་ཚུགས།" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས་ མཐུད་ལམ་ངལ་མཚམས།" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "%s་ལུ་མཐུད་དོ།" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "'%s'མོས་མཐུན་འབད་མ་ཚུགས།" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" @@ -1532,43 +1537,43 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" @@ -2385,6 +2390,16 @@ msgstr "%c%s... འཛོལ་བ་!" msgid "%c%s... Done" msgstr "%c%s... འབད་ཚར་ཡོད།" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... འབད་ཚར་ཡོད།" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2780,7 +2795,7 @@ msgstr "" "ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་" "མ་ཐོབ།" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2788,11 +2803,11 @@ msgstr "" "འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་" "སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3262,7 +3277,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/el.po b/po/el.po index cadfdda02..f6252ed32 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης \n" "Language-Team: Greek \n" @@ -654,7 +654,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -843,7 +843,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Απέτυχε" @@ -1404,7 +1404,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1431,59 +1431,64 @@ msgstr "Επερώτηση" msgid "Unable to invoke " msgstr "Αδύνατη η εκτέλεση" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Σύνδεση στο %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Αδύνατη η εύρεση του '%s'" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" @@ -1554,44 +1559,44 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -2410,6 +2415,16 @@ msgstr "%c%s... Σφάλμα!" msgid "%c%s... Done" msgstr "%c%s... Ολοκληρώθηκε" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Ολοκληρώθηκε" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2807,7 +2822,7 @@ msgstr "" "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " "κάποιας κατάλληλης αρχείοθήκης." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2815,11 +2830,11 @@ msgstr "" "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " "προκλήθηκε από κρατούμενα πακέτα." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3295,7 +3310,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/es.po b/po/es.po index 63e582ec6..56019b62d 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña \n" "Language-Team: Debian Spanish \n" @@ -697,7 +697,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -892,7 +892,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Calculando la actualización... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Falló" @@ -1469,7 +1469,7 @@ msgstr "Expiró conexión a socket de datos" msgid "Unable to accept connection" msgstr "No pude aceptar la conexión" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Se produjo un problema al hacer un hash del archivo" @@ -1496,59 +1496,64 @@ msgstr "Consulta" msgid "Unable to invoke " msgstr "No pude invocar " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectando a %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, 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:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "No se pudo resolver «%s»" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal al resolver «%s»" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "No se pudo conectar a %s:%s:" @@ -1617,43 +1622,43 @@ msgstr "Éste servidor de http tiene el soporte de alcance roto" msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Falló la selección" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Expiró la conexión" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Fallo la conexión" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Error interno" @@ -2483,6 +2488,16 @@ msgstr "%c%s... ¡Error!" msgid "%c%s... Done" msgstr "%c%s... Hecho" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Hecho" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2887,7 +2902,7 @@ msgstr "" "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para " "éste." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2895,12 +2910,12 @@ msgstr "" "Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido " "causado por paquetes retenidos." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes rotos." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3394,7 +3409,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/eu.po b/po/eu.po index 1bec8b578..4809d7232 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -635,7 +635,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -829,7 +829,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Huts egin du" @@ -1391,7 +1391,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1418,60 +1418,65 @@ msgstr "Kontsulta" msgid "Unable to invoke " msgstr "Ezin da deitu " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Konektatzen -> %s..." -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Ezin izan da '%s' ebatzi" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Aldi baterako akatsa '%s' ebaztean" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ezin da konektatu -> %s %s:" @@ -1538,43 +1543,43 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Barne errorea" @@ -2384,6 +2389,16 @@ msgstr "%c%s... Errorea!" msgid "%c%s... Done" msgstr "%c%s... Eginda" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Eginda" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2780,7 +2795,7 @@ msgid "" msgstr "" "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2788,11 +2803,11 @@ msgstr "" "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " "atxikitako paketeek eraginda." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3260,7 +3275,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/fi.po b/po/fi.po index 849bfc2f6..53d63dbd0 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -632,7 +632,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@ -826,7 +826,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Ei onnistunut" @@ -1382,7 +1382,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1409,59 +1409,64 @@ msgstr "Kysely" msgid "Unable to invoke " msgstr "Käynnistys ei onnistu" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Yhteyden %s avaus ei onnistu: %s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Avataan yhteys %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Nimeä \"%s\" ei voitu selvittää" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tilapäinen häiriö selvitettäessä \"%s\"" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" @@ -1530,43 +1535,43 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2380,6 +2385,16 @@ msgstr "%c%s... Virhe!" msgid "%c%s... Done" msgstr "%c%s... Valmis" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Valmis" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2770,7 +2785,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2778,11 +2793,11 @@ msgstr "" "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " "paketit." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3253,7 +3268,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/fr.po b/po/fr.po index 8407d3231..4d077d87a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-06-25 19:58+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -648,7 +648,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" @@ -851,7 +851,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Échec" @@ -1464,7 +1464,7 @@ msgstr "Délai de connexion au port de données dépassé" msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" @@ -1491,61 +1491,68 @@ msgstr "Requête" msgid "Unable to invoke " msgstr "Impossible d'invoquer " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Connexion à %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP : %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossible d'initialiser la connexion à %s: %s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Connexion à %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Ne parvient pas à résoudre « %s »" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Erreur temporaire de résolution de « %s »" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "" +"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:" +"%s » (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" "Quelque chose d'imprévisible est survenu lors de la détermination de « %s:" "%s » (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Impossible de se connecter à %s:%s :" @@ -1615,43 +1622,43 @@ msgstr "Ce serveur http possède un support des limites non-valide" msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:919 +#: methods/http.cc:923 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:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Erreur interne" @@ -2482,6 +2489,16 @@ msgstr "%c%s... Erreur !" msgid "%c%s... Done" msgstr "%c%s... Fait" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Fait" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2896,7 +2913,7 @@ msgstr "" "Le paquet %s doit être réinstallé, mais il est impossible de trouver son " "archive." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2904,13 +2921,13 @@ msgstr "" "Erreur, pkgProblem::Resolve a généré des ruptures, ce qui a pu être causé " "par les paquets devant être gardés en l'état." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3420,7 +3437,7 @@ msgstr "Préparation à la réception de la solution" msgid "External solver failed without a proper error message" msgstr "Échec du solveur externe sans message d'erreur adapté" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Exécu tion du solveur externe" diff --git a/po/gl.po b/po/gl.po index 15d867bc7..9bf5a9db1 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -639,7 +639,7 @@ msgstr "Interromper." msgid "Do you want to continue [Y/n]? " msgstr "Quere continuar [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" @@ -836,7 +836,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Calculando a anovación... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Fallou" @@ -1415,7 +1415,7 @@ msgstr "A conexión do socket de datos esgotou o tempo" msgid "Unable to accept connection" msgstr "Non é posíbel aceptar a conexión" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Xurdiu un problema ao calcular o hash do ficheiro" @@ -1442,59 +1442,64 @@ msgstr "Petición" msgid "Unable to invoke " msgstr "Non é posíbel chamar a " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectando a %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Non foi posíbel crear un socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Non é posíbel iniciar a conexión a %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Non foi posíbel conectar a %s:%s (%s), a conexión esgotou o tempo" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Non foi posíbel 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Non foi posíbel atopar «%s»" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Produciuse un fallo temporal ao buscar «%s»" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Non é posíbel conectar %s:%s:" @@ -1565,44 +1570,44 @@ msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada" msgid "Unknown date format" msgstr "Formato de datos descoñecido" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Produciuse un erro ao escribir no ficheiro de saída" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Produciuse un erro ao escribir nun ficheiro" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Produciuse un erro ao escribir no ficheiro" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "" "Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Produciuse un erro ao ler do servidor" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Produciuse un fallo na conexión" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Produciuse un erro interno" @@ -2427,6 +2432,16 @@ msgstr "%c%s... Erro!" msgid "%c%s... Done" msgstr "%c%s... Feito" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Feito" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2829,7 +2844,7 @@ msgstr "" "O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu " "arquivo." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2837,11 +2852,11 @@ msgstr "" "Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar " "causado por paquetes retidos." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3335,7 +3350,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/hu.po b/po/hu.po index d526ceb40..325d396cd 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -628,7 +628,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarja [I/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" @@ -826,7 +826,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Sikertelen" @@ -1426,7 +1426,7 @@ msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1453,59 +1453,64 @@ msgstr "Lekérdezés" msgid "Unable to invoke " msgstr "Nem lehet meghívni " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Csatlakozás: %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Foglalat létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nem lehet 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Kapcsolódás: %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Nem lehet feloldani a következőt: „%s”" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Átmeneti hiba „%s” feloldása közben" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Nem lehet csatlakozni ehhez: %s:%s:" @@ -1572,43 +1577,43 @@ msgstr "A HTTP-kiszolgáló tartománytámogatása sérült" msgid "Unknown date format" msgstr "Ismeretlen dátumformátum" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "A kiválasztás sikertelen" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:919 +#: methods/http.cc:923 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:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Rossz fejlécadatok" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Belső hiba" @@ -2427,6 +2432,16 @@ msgstr "%c%s... Hiba!" msgid "%c%s... Done" msgstr "%c%s... Kész" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Kész" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2835,7 +2850,7 @@ msgid "" msgstr "" "A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2843,11 +2858,11 @@ msgstr "" "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " "csomagok okozhatják." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3334,7 +3349,7 @@ msgstr "Felkészülés megoldás fogadására" msgid "External solver failed without a proper error message" msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Külső solver végrehajtása" diff --git a/po/it.po b/po/it.po index 98269398e..8258eaa4c 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-06-25 21:54+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -643,7 +643,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" @@ -842,7 +842,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Non riuscito" @@ -1445,7 +1445,7 @@ msgstr "Connessione al socket dati terminata" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Si è verificato un problema nel creare l'hash del file" @@ -1472,60 +1472,66 @@ msgstr "Interrogazione" msgid "Unable to invoke " msgstr "Impossibile invocare " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Connessione a %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossibile iniziare la connessione a %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Impossibile connettersi a %s:%s (%s), connessione terminata" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Impossibile risolvere \"%s\"" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Risoluzione di \"%s\" temporaneamente non riuscita" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "" +"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" "Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Impossibile connettersi a %s:%s:" @@ -1595,43 +1601,43 @@ msgstr "Questo server HTTP ha un supporto del range non corretto" msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Select non riuscita" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Connessione terminata" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Errore nello scrivere sul file di output" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Errore nello scrivere su file" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Errore nello scrivere sul file" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Errore nel leggere dal server" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Header dati non corretto" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Connessione non riuscita" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Errore interno" @@ -2460,6 +2466,16 @@ msgstr "%c%s... Errore" msgid "%c%s... Done" msgstr "%c%s... Fatto" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Fatto" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2874,7 +2890,7 @@ msgstr "" "Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un " "archivio." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2882,12 +2898,12 @@ msgstr "" "Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo " "potrebbe essere causato da pacchetti bloccati." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3389,7 +3405,7 @@ msgstr "Preparazione alla ricezione della soluzione" msgid "External solver failed without a proper error message" msgstr "Il solver esterno è terminato senza un errore di messaggio" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Esecuzione solver esterno" diff --git a/po/ja.po b/po/ja.po index fb455abcc..708611629 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-07-01 00:14+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -155,7 +155,7 @@ msgid " Version table:" msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -485,7 +485,7 @@ msgstr "ダウンロードできないため、%s の再インストールは不 msgid "%s is already the newest version.\n" msgstr "%s はすでに最新バージョンです。\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" @@ -595,8 +595,8 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま msgid "After this operation, %sB disk space will be freed.\n" msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" @@ -606,15 +606,17 @@ msgstr "%s の空き領域を測定できません" msgid "You don't have enough free space in %s." msgstr "%s に充分な空きスペースがありません。" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -625,28 +627,28 @@ msgstr "" "続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "中断しました。" -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -654,19 +656,19 @@ msgstr "" "いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-" "missing オプションを付けて試してみてください。" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "足りないパッケージを直すことができません。" -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "インストールを中断します。" -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -677,36 +679,36 @@ msgstr[0] "" "以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n" "システムから消えました:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "注意: これは dpkg により自動でわざと行われれます。" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "パッケージ '%2$s' の利用できないターゲットリリース '%1$s' を無視" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "パッケージ '%2$s' の利用できないバージョン '%1$s' を無視" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "一連のものを削除するようになっていないので、AutoRemover を開始できません" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -724,15 +726,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部エラー、AutoRemover が何かを破壊しました" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -741,7 +743,7 @@ msgid_plural "" msgstr[0] "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -750,22 +752,22 @@ msgstr[0] "" "%lu つのパッケージが自動でインストールされましたが、もう必要とされていませ" "ん:\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -773,7 +775,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -785,33 +787,33 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s は自動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -819,47 +821,47 @@ msgstr "" "このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わり" "に使用してください。" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "%s %s をダウンロードしています" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -869,7 +871,7 @@ msgstr "" "ます:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -881,70 +883,70 @@ msgstr "" "bzr branch %s\n" "を使用してください。\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -953,17 +955,17 @@ msgstr "" "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt.conf" "(5) の APT::Architectures を参照してください。" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -972,7 +974,7 @@ msgstr "" "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s " "の依存関係を満たすことができません" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -981,14 +983,14 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, 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:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -997,7 +999,7 @@ msgstr "" "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた" "め、%2$s に対する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1006,30 +1008,30 @@ msgstr "" "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関" "係を満たすことができません" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) の変更履歴" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1121,7 +1123,7 @@ msgstr "" "apt-get(8)、sources.list(5)、apt.conf(5) を参照してください。\n" " この APT は Super Cow Powers 化されています。\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1422,7 +1424,7 @@ msgstr "データソケット接続タイムアウト" msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1449,59 +1451,64 @@ msgstr "問い合わせ" msgid "Unable to invoke " msgstr "呼び出せません" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) へ接続しています" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s) への接続を開始できません。" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "%s へ接続しています" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "'%s' を解決できませんでした" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' が一時的に解決できません" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "%s:%s へ接続できません:" @@ -1567,43 +1574,43 @@ msgstr "HTTP サーバのレンジサポートが壊れています" msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "内部エラー" @@ -1734,7 +1741,7 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" @@ -2417,6 +2424,16 @@ msgstr "%c%s... エラー!" msgid "%c%s... Done" msgstr "%c%s... 完了" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... 完了" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2779,7 +2796,7 @@ msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2788,12 +2805,12 @@ msgstr "" "'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::" "Immediate-Configure の項を参照してください。(%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "'%s' を設定できませんでした。" -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2817,7 +2834,7 @@ msgstr "" "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" "つけることができませんでした。" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2825,11 +2842,11 @@ msgstr "" "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" "ジが原因です。" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2980,21 +2997,21 @@ msgstr "この APT が対応している以上の数の依存関係が発生し msgid "Package %s %s was not found while processing file dependencies" msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "パッケージリストを読み込んでいます" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "ファイル提供情報を収集しています" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" @@ -3322,7 +3339,7 @@ msgstr "解決を受け取る準備" msgid "External solver failed without a proper error message" msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "外部ソルバを実行" diff --git a/po/km.po b/po/km.po index 578e246a7..aea6d34cb 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -635,7 +635,7 @@ msgstr "បោះបង់ ។" msgid "Do you want to continue [Y/n]? " msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" @@ -818,7 +818,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "បាន​បរាជ័យ" @@ -1366,7 +1366,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័ msgid "Unable to accept connection" msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" @@ -1393,59 +1393,64 @@ msgstr "សំណួរ​" msgid "Unable to invoke " msgstr "មិន​អាច​ហៅ​ " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP ៖ %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "មិនអាច​ចាប់ផ្ដើម​ការតភ្ជាប់​​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ។" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល​" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "មិន​អាច​ដោះស្រាយ​ '%s' បានឡើយ" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖" @@ -1510,43 +1515,43 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ msgid "Unknown date format" msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "ជ្រើស​បាន​បរាជ័យ​" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "ការតភ្ជាប់​បាន​អស់ពេល​" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "ទិន្នន័យ​បឋមកថា​ខូច" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" @@ -2354,6 +2359,16 @@ msgstr "%c%s... កំហុស ​!" msgid "%c%s... Done" msgstr "%c%s... ធ្វើរួច​" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... ធ្វើរួច​" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2745,7 +2760,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2753,11 +2768,11 @@ msgstr "" "កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​" "ដែលបាន​ទុក ។" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3221,7 +3236,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/ko.po b/po/ko.po index 0c0b978d6..ba7f6bef7 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -632,7 +632,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" @@ -815,7 +815,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "실패" @@ -1384,7 +1384,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1411,59 +1411,64 @@ msgstr "질의" msgid "Unable to invoke " msgstr "다음을 실행할 수 없습니다: " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "'%s'의 주소를 알아낼 수 없습니다" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s'의 주소를 알아내는데 임시로 실패했습니다" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "%s:%s에 연결할 수 없습니다:" @@ -1528,43 +1533,43 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "출력 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "해당 파일에 쓰는데 오류가 발생했습니다" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "서버에서 읽는데 오류가 발생했습니다" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "내부 오류" @@ -2377,6 +2382,16 @@ msgstr "%c%s... 오류!" msgid "%c%s... Done" msgstr "%c%s... 완료" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... 완료" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2771,7 +2786,7 @@ msgid "" msgstr "" "%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2779,11 +2794,11 @@ msgstr "" "오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수" "도 있습니다." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3254,7 +3269,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/ku.po b/po/ku.po index befc58323..e584866a6 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -590,7 +590,7 @@ msgstr "Betal." msgid "Do you want to continue [Y/n]? " msgstr "Dixwazî bidomînî [E/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" @@ -765,7 +765,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Bilindkirin tê hesibandin..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Serneket" @@ -1267,7 +1267,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "" @@ -1295,59 +1295,64 @@ msgstr "Lêpirsîn" msgid "Unable to invoke " msgstr "%s venebû" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Girêdan bi %s (%s) re pêk tê" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Bi %s re tê girêdan" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Nikarî '%s' çareser bike" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nikare bi %s re girêdan pêk bîne %s:" @@ -1412,44 +1417,44 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Hilbijartin neserketî" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "" -#: methods/http.cc:846 +#: methods/http.cc:850 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Girêdan pêk nehatiye" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Çewtiya hundirîn" @@ -2198,6 +2203,16 @@ msgstr "%c%s... Çewtî!" msgid "%c%s... Done" msgstr "%c%s... Çêbû" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Çêbû" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2584,17 +2599,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3048,7 +3063,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/lt.po b/po/lt.po index e159afa43..a7209df6a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -598,7 +598,7 @@ msgstr "Nutraukti." msgid "Do you want to continue [Y/n]? " msgstr "Ar norite tęsti [T/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" @@ -782,7 +782,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Skaičiuojami atnaujinimai... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Nepavyko" @@ -1293,7 +1293,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "" @@ -1320,59 +1320,64 @@ msgstr "Užklausti" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Jungiamasi prie %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nepavyko prisijungti prie %s:%s (%s), prisijungimas per ilgai užtruko" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nepavyko prisijungti prie %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Jungiamasi prie %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Nepavyko surasti vardo „%s“" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Laikinas sutrikimas ieškant vardo „%s“" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nepavyko prisijungti prie %s %s:" @@ -1436,43 +1441,43 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Prisijungimo laiko limitas baigėsi" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Klaida bandant rašyti į failą" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Prisijungti nepavyko" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Vidinė klaida" @@ -2292,6 +2297,16 @@ msgstr "%c%s... Klaida!" msgid "%c%s... Done" msgstr "%c%s... Baigta" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Baigta" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2678,17 +2693,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3147,7 +3162,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/mr.po b/po/mr.po index 1bedf2b34..3b2b8a45e 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -629,7 +629,7 @@ msgstr "व्यत्यय/बंद करा." msgid "Do you want to continue [Y/n]? " msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" @@ -818,7 +818,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "असमर्थ" @@ -1369,7 +1369,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" @@ -1396,59 +1396,64 @@ msgstr "प्रश्न" msgid "Unable to invoke " msgstr "जारी करण्यास करण्यास असमर्थ" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) ला जोडत आहे" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[आयपी:%s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s). साठी जोडणी इनिशिएट/पुढाकारीत करू शकत नाही" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) ला जोडू शकत नाही,जोडणी वेळेअभावी तुटली" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "%s ला जोडत आहे" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "%s रिझॉल्व्ह होऊ शकत नाही " -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s ला जोडण्यास असमर्थ:" @@ -1514,43 +1519,43 @@ msgstr "HTTP सर्व्हरने विस्तार तांत् msgid "Unknown date format" msgstr "अपरिचित दिनांक प्रकार/स्वरूप " -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "चुकीचा शीर्षक डाटा" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "जोडणी अयशस्वी" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "अंतर्गत त्रुटी" @@ -2359,6 +2364,16 @@ msgstr "%c%s... चूक/त्रुटी!" msgid "%c%s... Done" msgstr "%c%s... झाले" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... झाले" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2750,7 +2765,7 @@ msgid "" msgstr "" "%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2758,11 +2773,11 @@ msgstr "" "दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित " "पॅकेजेस असू शकते." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3234,7 +3249,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/nb.po b/po/nb.po index 397e74536..b51e2be57 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -640,7 +640,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" @@ -831,7 +831,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Mislyktes" @@ -1397,7 +1397,7 @@ msgstr "Tidsavbrudd på tilkoblingen til datasokkelen" msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@ -1424,59 +1424,64 @@ msgstr "Spørring" msgid "Unable to invoke " msgstr "Klarte ikke å starte" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Kobler til %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikke å slå opp «%s»" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig feil ved oppslag av «%s»" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Klarte ikke koble til %s:%s:" @@ -1543,43 +1548,43 @@ msgstr "Denne HTTP-tjeneren har ødelagt støtte for område" msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Tidsavbrudd på forbindelsen" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Ødelagte hodedata" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Intern feil" @@ -2399,6 +2404,16 @@ msgstr "%c%s ... Feil" msgid "%c%s... Done" msgstr "%c%s ... Ferdig" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s ... Ferdig" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2792,7 +2807,7 @@ msgid "" msgstr "" "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2800,11 +2815,11 @@ msgstr "" "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " "som holdes tilbake." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3283,7 +3298,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/ne.po b/po/ne.po index 672ecbdc2..02c55d0d8 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -633,7 +633,7 @@ msgstr "परित्याग गर्नुहोस् ।" msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" @@ -818,7 +818,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "असफल भयो" @@ -1367,7 +1367,7 @@ msgstr "डेटा सकेटको जडान समय सकियो" msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" @@ -1394,59 +1394,64 @@ msgstr "क्वेरी" msgid "Unable to invoke " msgstr "आह्वान गर्न असक्षम भयो" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr " %s:%s (%s) मा जडान सुरुवात गर्न सकेन" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) मा जडान गर्न सकिएन, जडान समय सकियो" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "%s मा जडान गरिदैछ" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "'%s' हल गर्न सकिएन" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' हल गर्दा अस्थायी असफल" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s मा जडान गर्न असफल भयो:" @@ -1511,43 +1516,43 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "आन्तरिक त्रुटि" @@ -2356,6 +2361,16 @@ msgstr "%c%s... त्रुटि!" msgid "%c%s... Done" msgstr "%c%s... गरियो" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... गरियो" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2747,7 +2762,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2755,11 +2770,11 @@ msgstr "" "त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको " "कारणले गर्दा हो ।" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3225,7 +3240,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/nl.po b/po/nl.po index 67840c55b..fc47d1e3f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" @@ -642,7 +642,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" @@ -836,7 +836,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Mislukt" @@ -1413,7 +1413,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1440,59 +1440,64 @@ msgstr "Zoekopdracht" msgid "Unable to invoke " msgstr "Aanroepen mislukt van " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan de verbinding met %s:%s (%s) niet aangaan." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Kon '%s' niet vinden" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tijdelijke fout bij het opzoeken van '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Kan geen verbinding maken met %s %s:" @@ -1564,44 +1569,44 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:919 +#: methods/http.cc:923 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:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Interne fout" @@ -2429,6 +2434,16 @@ msgstr "%c%s... Fout!" msgid "%c%s... Done" msgstr "%c%s... Klaar" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Klaar" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2830,7 +2845,7 @@ msgstr "" "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " "gevonden worden." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2838,11 +2853,11 @@ msgstr "" "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan " "veroorzaakt worden door vastgehouden pakketten." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3338,7 +3353,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/nn.po b/po/nn.po index 95b70357e..9c4e9970e 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -645,7 +645,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -830,7 +830,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Mislukkast" @@ -1384,7 +1384,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1411,59 +1411,64 @@ msgstr "Sp msgid "Unable to invoke " msgstr "Klarte ikkje starta " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Koplar til %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Koplar til %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikkje sl opp %s" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Mellombels feil ved oppslag av %s" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Klarte ikkje kopla til %s %s:" @@ -1528,43 +1533,43 @@ msgstr "Denne HTTP-tenaren har msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Intern feil" @@ -2369,6 +2374,16 @@ msgstr "%c%s ... Feil" msgid "%c%s... Done" msgstr "%c%s ... Ferdig" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s ... Ferdig" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2761,7 +2776,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Pakken %s m installerast p nytt, men arkivet finst ikkje." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2769,12 +2784,12 @@ msgstr "" "Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar " "som er haldne tilbake." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3244,7 +3259,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/pl.po b/po/pl.po index 04eba799f..d8e9d2490 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -640,7 +640,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Kontynuować [T/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" @@ -849,7 +849,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Nie udało się" @@ -1454,7 +1454,7 @@ msgstr "Przekroczony czas połączenia gniazda danych" msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" @@ -1481,59 +1481,64 @@ msgstr "Info" msgid "Unable to invoke " msgstr "Nie można wywołać " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Łączenie z %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, 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:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Łączenie z %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Nie udało się przetłumaczyć nazwy \"%s\"" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\"" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Nie udało się połączyć z %s:%s:" @@ -1602,43 +1607,43 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)" msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Operacja select nie powiodła się" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Błąd przy pisaniu do pliku wyjściowego" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Błąd czytania z serwera" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Błędne dane nagłówka" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Połączenie nie powiodło się" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Błąd wewnętrzny" @@ -2461,6 +2466,16 @@ msgstr "%c%s... Błąd!" msgid "%c%s... Done" msgstr "%c%s... Gotowe" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Gotowe" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2863,7 +2878,7 @@ msgstr "" "Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego " "archiwum." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2871,11 +2886,11 @@ msgstr "" "Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane " "zatrzymanymi pakietami." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3364,7 +3379,7 @@ msgstr "" "Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania " "prawidłowego komunikatu o błędzie" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności" diff --git a/po/pt.po b/po/pt.po index 05fcc2142..b6b5d8b0b 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -636,7 +636,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" @@ -830,7 +830,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "A calcular a actualização... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Falhou" @@ -1428,7 +1428,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1455,59 +1455,64 @@ msgstr "Pesquisa" msgid "Unable to invoke " msgstr "Não foi possível invocar " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "A Ligar a %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, 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:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "A ligar a %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Não foi possível resolver '%s'" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Falha temporária a resolver '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Não foi possível ligar a %s:%s:" @@ -1577,43 +1582,43 @@ msgstr "Este servidor HTTP possui suporte de range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "A selecção falhou" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "O tempo da ligação expirou" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Erro ao escrever para o ficheiro de saída" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "A ligação falhou" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Erro interno" @@ -2435,6 +2440,16 @@ msgstr "%c%s... Erro !" msgid "%c%s... Done" msgstr "%c%s... Pronto" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Pronto" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2840,7 +2855,7 @@ msgstr "" "O pacote %s necessita ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2848,13 +2863,13 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) " "estragados." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3355,7 +3370,7 @@ msgstr "Preparar para receber solução" msgid "External solver failed without a proper error message" msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Executar resolvedor externo" diff --git a/po/pt_BR.po b/po/pt_BR.po index 593a509e3..bc73f09d6 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -636,7 +636,7 @@ msgstr "Renunțare." msgid "Do you want to continue [Y/n]? " msgstr "Vreți să continuați [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" @@ -835,7 +835,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Eșec" @@ -1401,7 +1401,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat" msgid "Unable to accept connection" msgstr "Nu s-a putut accepta conexiune" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problemă la calcularea dispersiei pentru fișierul" @@ -1428,60 +1428,65 @@ msgstr "Interogare" msgid "Unable to invoke " msgstr "Nu s-a putut invoca" -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectare la %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nu s-a putut crea un socket pentru %s (f=%u t=%u p=%u)" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nu s-a putut iniția conexiunea cu %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Nu s-a putut realiza conexiunea cu %s:%s (%s), timpul de conectare expirat" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Conectare la %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Nu s-a putut rezolva „%s”" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Eșec temporar la rezolvarea lui „%s”" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nu s-a putut realiza conexiunea cu %s %s:" @@ -1551,44 +1556,44 @@ msgstr "Acest server HTTP are un suport defect de intervale" msgid "Unknown date format" msgstr "Format dată necunoscut" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Selecția a eșuat" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Eroare la scrierea fișierului de rezultat" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Eroare la citirea de la server" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Conectare eșuată" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Eroare internă" @@ -2413,6 +2418,16 @@ msgstr "%c%s... Eroare!" msgid "%c%s... Done" msgstr "%c%s... Terminat" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Terminat" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2806,7 +2821,7 @@ msgid "" msgstr "" "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2814,11 +2829,11 @@ msgstr "" "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " "cauzată de pachete ținute." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3299,7 +3314,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/ru.po b/po/ru.po index c60c9a384..2a72ee3c1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-10-15 09:49+0200\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Таблица версий:" #: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 +#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format @@ -490,7 +490,7 @@ msgstr "Переустановка %s невозможна, он не скачи msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" -#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" @@ -605,8 +605,8 @@ msgstr "" "После данной операции, объём занятого дискового пространства уменьшится на " "%sB.\n" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 -#: cmdline/apt-get.cc:2592 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" @@ -616,17 +616,19 @@ msgstr "Не удалось определить количество свобо msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " "операция." -#: cmdline/apt-get.cc:1259 +#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be +#. careful with hard to type or special characters (like non-breaking spaces) +#: cmdline/apt-get.cc:1261 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" -#: cmdline/apt-get.cc:1261 +#: cmdline/apt-get.cc:1263 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -637,28 +639,28 @@ msgstr "" "Чтобы продолжить, введите фразу: «%s»\n" " ?] " -#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 +#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 msgid "Abort." msgstr "Аварийное завершение." -#: cmdline/apt-get.cc:1282 +#: cmdline/apt-get.cc:1284 msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" -#: cmdline/apt-get.cc:1372 +#: cmdline/apt-get.cc:1374 msgid "Some files failed to download" msgstr "Некоторые файлы скачать не удалось" -#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 +#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 msgid "Download complete and in download only mode" msgstr "Указан режим «только скачивание», и скачивание завершено" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1381 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -666,19 +668,19 @@ msgstr "" "Невозможно получить некоторые архивы, вероятно надо запустить apt-get update " "или попытаться повторить запуск с ключом --fix-missing" -#: cmdline/apt-get.cc:1383 +#: cmdline/apt-get.cc:1385 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1390 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1391 msgid "Aborting install." msgstr "Аварийное завершение установки." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1419 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -695,35 +697,35 @@ msgstr[2] "" "Следующие пакеты исчез из системы, так как все их файлы\n" "теперь берутся из других пакетов:" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1423 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Замечание: это сделано автоматически и специально программой dpkg." -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1561 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Игнорируется недоступный выпуск «%s» пакета «%s»" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1593 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Используется «%s» в качестве исходного пакета вместо «%s»\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1631 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Игнорируется недоступная версия «%s» пакета «%s»" -#: cmdline/apt-get.cc:1645 +#: cmdline/apt-get.cc:1647 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1713 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover" -#: cmdline/apt-get.cc:1815 +#: cmdline/apt-get.cc:1817 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -741,15 +743,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 +#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" -#: cmdline/apt-get.cc:1822 +#: cmdline/apt-get.cc:1824 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутренняя ошибка, AutoRemover всё поломал" -#: cmdline/apt-get.cc:1829 +#: cmdline/apt-get.cc:1831 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -761,7 +763,7 @@ msgstr[1] "" msgstr[2] "" "Следующие пакеты устанавливались автоматически и больше не требуются:" -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:1835 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -770,24 +772,24 @@ msgstr[0] "%lu пакет был установлен автоматически msgstr[1] "%lu пакета было установлено автоматически и больше не требуется.\n" msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1837 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "Для его удаления используйте «apt-get autoremove»." msgstr[1] "Для их удаления используйте «apt-get autoremove»." msgstr[2] "Для их удаления используйте «apt-get autoremove»." -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1856 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade всё поломал" -#: cmdline/apt-get.cc:1953 +#: cmdline/apt-get.cc:1955 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -" "f install»:" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1959 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -795,7 +797,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1974 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" @@ -806,33 +808,33 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:1995 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2021 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:2109 +#: cmdline/apt-get.cc:2111 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:2110 +#: cmdline/apt-get.cc:2112 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:2152 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s выбран для автоматической установки.\n" -#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -840,47 +842,47 @@ msgstr "" "Эта команда устарела. Используйте вместо неё «apt-mark auto» и «apt-mark " "manual»." -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2185 msgid "Calculating upgrade... " msgstr "Расчёт обновлений…" -#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2193 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 +#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: cmdline/apt-get.cc:2391 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Downloading %s %s" msgstr "Выполняется загрузка %s %s" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2453 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 +#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:2508 +#: cmdline/apt-get.cc:2510 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -889,7 +891,7 @@ msgstr "" "ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n" "%s\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "Please use:\n" @@ -900,70 +902,70 @@ msgstr "" "bzr branch %s\n" "для получения последних (возможно не выпущенных) обновлений пакета.\n" -#: cmdline/apt-get.cc:2566 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл «%s»\n" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2612 +#: cmdline/apt-get.cc:2614 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2663 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:2692 +#: cmdline/apt-get.cc:2694 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2706 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:2705 +#: cmdline/apt-get.cc:2707 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: cmdline/apt-get.cc:2727 +#: cmdline/apt-get.cc:2729 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:2747 +#: cmdline/apt-get.cc:2749 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2766 +#: cmdline/apt-get.cc:2768 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2791 +#: cmdline/apt-get.cc:2793 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -972,17 +974,17 @@ msgstr "" "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 +#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2838 +#: cmdline/apt-get.cc:2840 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3010 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -991,7 +993,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как %s не " "разрешён для пакетов «%s»" -#: cmdline/apt-get.cc:3026 +#: cmdline/apt-get.cc:3028 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1000,14 +1002,14 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:3049 +#: cmdline/apt-get.cc:3051 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:3088 +#: cmdline/apt-get.cc:3090 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1016,7 +1018,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как версия-" "кандидат пакета %s не может удовлетворить требованиям по версии" -#: cmdline/apt-get.cc:3094 +#: cmdline/apt-get.cc:3096 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1025,30 +1027,30 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "имеет версии-кандидата" -#: cmdline/apt-get.cc:3117 +#: cmdline/apt-get.cc:3119 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:3133 +#: cmdline/apt-get.cc:3135 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:3138 +#: cmdline/apt-get.cc:3140 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 +#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog для %s (%s)" -#: cmdline/apt-get.cc:3366 +#: cmdline/apt-get.cc:3368 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:3407 +#: cmdline/apt-get.cc:3409 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1140,7 +1142,7 @@ msgstr "" "содержится подробная информация и описание параметров.\n" " В APT есть коровья СУПЕРСИЛА.\n" -#: cmdline/apt-get.cc:3572 +#: cmdline/apt-get.cc:3574 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1448,7 +1450,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" @@ -1475,59 +1477,64 @@ msgstr "Запрос" msgid "Unable to invoke " msgstr "Невозможно вызвать " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Соединение с %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Невозможно инициализировать соединение с %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Соединение с %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Не удалось найти IP-адрес для «%s»" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Временная ошибка при попытке получить IP-адрес «%s»" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Что-то странное произошло при определении «%s:%s» (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Что-то странное произошло при определении «%s:%s» (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Невозможно соединиться с %s: %s:" @@ -1595,43 +1602,43 @@ msgstr "Этот HTTP-сервер не поддерживает скачива msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -1765,7 +1772,7 @@ msgstr "" " -c=? Читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@ -2457,6 +2464,16 @@ msgstr "%c%s… Ошибка!" msgid "%c%s... Done" msgstr "%c%s… Готово" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… Готово" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2824,7 +2841,7 @@ msgstr "Искажённая строка %u в списке источнико msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" -#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2833,12 +2850,12 @@ msgstr "" "Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 " "apt.conf о APT::Immediate-Configure. (%d)" -#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 #, c-format msgid "Could not configure '%s'. " msgstr "Не удалось настроить «%s»." -#: apt-pkg/packagemanager.cc:545 +#: apt-pkg/packagemanager.cc:546 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2863,7 +2880,7 @@ msgid "" msgstr "" "Пакет %s нуждается в переустановке, но найти архив для него не удалось." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2871,11 +2888,11 @@ msgstr "" "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " "может быть вызвано отложенными (held) пакетами." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3024,21 +3041,21 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" -#: apt-pkg/pkgcachegen.cc:1146 +#: apt-pkg/pkgcachegen.cc:1150 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" -#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338 -#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501 +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 msgid "Reading package lists" msgstr "Чтение списков пакетов" -#: apt-pkg/pkgcachegen.cc:1251 +#: apt-pkg/pkgcachegen.cc:1255 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" -#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450 +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников" @@ -3366,7 +3383,7 @@ msgstr "Подготовка к приёму решения" msgid "External solver failed without a proper error message" msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Запустить внешний решатель" diff --git a/po/sk.po b/po/sk.po index ece547d5c..8fb8e84e4 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -633,7 +633,7 @@ msgstr "Prerušené." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" @@ -835,7 +835,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Chyba" @@ -1425,7 +1425,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problém s hašovaním súboru" @@ -1452,59 +1452,64 @@ msgstr "Dotaz" msgid "Unable to invoke " msgstr "Nedá sa vyvolať " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Pripája sa k %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Pripája sa k %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Nie je možné preložiť „%s“" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Dočasné zlyhanie pri preklade „%s“" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Nedá sa pripojiť k %s:%s:" @@ -1570,43 +1575,43 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov" msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Chyba zápisu do tohto súboru" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Vnútorná chyba" @@ -2419,6 +2424,16 @@ msgstr "%c%s... Chyba!" msgid "%c%s... Done" msgstr "%c%s... Hotovo" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Hotovo" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2812,7 +2827,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2820,11 +2835,11 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " "pridržanými balíkmi." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3307,7 +3322,7 @@ msgstr "Pripraviť sa na prijatie riešenia" msgid "External solver failed without a proper error message" msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Spustiť externého riešiteľa" diff --git a/po/sl.po b/po/sl.po index a2ff51eb6..ead4d1090 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -630,7 +630,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali želite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" @@ -836,7 +836,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Preračunavanje nadgradnje ... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Spodletelo" @@ -1423,7 +1423,7 @@ msgstr "Povezava podatkovne vtičnice je zakasnela" msgid "Unable to accept connection" msgstr "Ni mogoče sprejeti povezave" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Težava med razprševanjem datoteke" @@ -1450,59 +1450,64 @@ msgstr "Poizvedba" msgid "Unable to invoke " msgstr "Ni mogoče klicati " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Povezovanje z %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Ni mogoče ustvariti vtiča za %s (f=%u t=%u p=%u)" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, 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:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Ni se mogoče povezati z %s:%s (%s). Povezava je zakasnela." -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Povezovanje z %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Ni mogoče razrešiti '%s'" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Začasna napaka med razreševanjem '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Ni se mogoče povezati z %s:%s:" @@ -1568,43 +1573,43 @@ msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore" msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Povezava je zakasnela" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Napaka med pisanjem v izhodno datoteko" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Napaka med pisanjem v datoteko" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Napaka med branjem s strežnika" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Napačni podatki glave" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Notranja napaka" @@ -2419,6 +2424,16 @@ msgstr "%c%s ... Napaka!" msgid "%c%s... Done" msgstr "%c%s ... Narejeno" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s ... Narejeno" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2817,7 +2832,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paket %s mora biti znova nameščen, vendar ni mogoče najti arhiva zanj." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2825,11 +2840,11 @@ msgstr "" "Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda " "povzročili zadržani paketi." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3311,7 +3326,7 @@ msgstr "Priprava za rešitev prejemanja" msgid "External solver failed without a proper error message" msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Izvedi zunanji reševalnik" diff --git a/po/sv.po b/po/sv.po index 02bcf0c49..7ba779a6f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -637,7 +637,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" @@ -831,7 +831,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Misslyckades" @@ -1407,7 +1407,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen" msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@ -1436,61 +1436,67 @@ msgid "Unable to invoke " msgstr "Kunde inte starta " # Felmeddelande för misslyckad chdir -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Ansluter till %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" # [f]amilj, [t]yp, [p]rotokoll -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kunde inte skapa ett uttag (socket) för %s (f=%u t=%u p=%u)" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kunde inte initiera anslutningen till %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen överskred tidsgräns" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Kunde inte slå upp \"%s\"" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporärt fel vid uppslagning av \"%s\"" # Okänd felkod; %i = koden -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)" + +# Okänd felkod; %i = koden +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Kunde inte ansluta till %s:%s:" @@ -1559,43 +1565,43 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:919 +#: methods/http.cc:923 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:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Felaktiga data i huvud" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Anslutningen misslyckades" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Internt fel" @@ -2417,6 +2423,16 @@ msgstr "%c%s... Fel!" msgid "%c%s... Done" msgstr "%c%s... Färdig" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Färdig" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2815,7 +2831,7 @@ msgid "" msgstr "" "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2823,11 +2839,11 @@ msgstr "" "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " "tillbakahållna paket." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3311,7 +3327,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/th.po b/po/th.po index 9da100061..ef2b6a45d 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -623,7 +623,7 @@ msgstr "เลิกทำ" msgid "Do you want to continue [Y/n]? " msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" @@ -804,7 +804,7 @@ msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แ msgid "Calculating upgrade... " msgstr "กำลังคำนวณการปรับรุ่น... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "ล้มเหลว" @@ -1380,7 +1380,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม" @@ -1407,59 +1407,64 @@ msgstr "สอบถาม" msgid "Unable to invoke " msgstr "ไม่สามารถเรียก " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "เชื่อมต่อไปยัง %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "ไม่สามารถเริ่มการเชื่อมต่อไปยัง %s:%s (%s)" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s) เนื่องจากหมดเวลาคอย" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "เชื่อมต่อไปยัง %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:" @@ -1523,43 +1528,43 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์ msgid "Unknown date format" msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "ข้อมูลส่วนหัวผิดพลาด" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" @@ -2358,6 +2363,16 @@ msgstr "%c%s... ผิดพลาด!" msgid "%c%s... Done" msgstr "%c%s... เสร็จแล้ว" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... เสร็จแล้ว" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2750,7 +2765,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2758,11 +2773,11 @@ msgstr "" "ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย " "อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3227,7 +3242,7 @@ msgstr "เตรียมรับคำตอบ" msgid "External solver failed without a proper error message" msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "เรียกกลไกการแก้ปัญหาภายนอก" diff --git a/po/tl.po b/po/tl.po index a92a8114e..85f159546 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -647,7 +647,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@ -832,7 +832,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Bigo" @@ -1389,7 +1389,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1416,59 +1416,64 @@ msgstr "Tanong" msgid "Unable to invoke " msgstr "Hindi ma-invoke " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Kumokonekta sa %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Hindi maresolba ang '%s'" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Hindi maka-konekta sa %s %s:" @@ -1538,43 +1543,43 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Internal na error" @@ -2393,6 +2398,16 @@ msgstr "%c%s... Error!" msgid "%c%s... Done" msgstr "%c%s... Tapos" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Tapos" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2792,7 +2807,7 @@ msgstr "" "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " "para dito." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2800,12 +2815,12 @@ msgstr "" "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " "ito ng mga paketeng naka-hold." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3283,7 +3298,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/uk.po b/po/uk.po index 4a1706204..cfad1393a 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -644,7 +644,7 @@ msgstr "Перервано." msgid "Do you want to continue [Y/n]? " msgstr "Бажаєте продовжити [Y/n]? " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" @@ -844,7 +844,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Обчислення оновлень... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Невдача" @@ -1444,7 +1444,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Проблема хешування файла" @@ -1471,59 +1471,64 @@ msgstr "Черга" msgid "Unable to invoke " msgstr "Неможливо викликати " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "З'єднання з %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Неможливо почати з'єднання з %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "З'єднання з %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Не можу знайти IP адрес для %s" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Тимчасова помилка при отриманні IP адреси '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Неможливо під'єднатися до %s:%s:" @@ -1591,43 +1596,43 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran msgid "Unknown date format" msgstr "Невідомий формат дати" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Вибір провалився" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Помилка запису у вихідний файл" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Помилка запису у файл" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Помилка запису у файл" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Помилка зчитування з сервера" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Погана заголовкова інформація" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "З'єднання не вдалося" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Внутрішня помилка" @@ -2462,6 +2467,16 @@ msgstr "%c%s... Помилка!" msgid "%c%s... Done" msgstr "%c%s... Виконано" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Виконано" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2863,7 +2878,7 @@ msgid "" msgstr "" "Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2871,11 +2886,11 @@ msgstr "" "Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути " "пов'язано з зафіксованими пакунками." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3363,7 +3378,7 @@ msgstr "" "Зовнішній розв'язувач завершився невдало без відповідного повідомлення про " "помилку" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 #, fuzzy msgid "Execute external solver" msgstr "Виконати зовнішній розв'язувач" diff --git a/po/vi.po b/po/vi.po index fc79aa87a..ac756e31d 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2012-11-20 14:12+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -640,7 +640,7 @@ msgstr "Hủy bỏ." msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [C/k] " -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc lấy %s bị lỗi %s\n" @@ -827,7 +827,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "Đang tính bước nâng cấp... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "Gặp lỗi" @@ -1421,7 +1421,7 @@ msgstr "Quá giờ kết nối ổ cắm dữ liệu" msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Gặp khó khăn khi tạo chuỗi duy nhất cho tập tin" @@ -1448,59 +1448,64 @@ msgstr "Truy vấn" msgid "Unable to invoke " msgstr "Không thể gọi " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Đang kết nối đến %s (%s)..." -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[Địa chỉ IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, 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:107 +#: methods/connect.cc:108 #, 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:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Đang kết nối đến %s..." -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Không thể tháo gỡ “%s”" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Việc tháo gỡ “%s” bị lỗi tạm thời" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Không thể kết nối đến %s: %s:" @@ -1571,43 +1576,43 @@ msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" msgid "Unknown date format" msgstr "Không rõ dạng ngày" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:919 +#: methods/http.cc:923 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:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@ -2444,6 +2449,16 @@ msgstr "%c%s... Lỗi!" msgid "%c%s... Done" msgstr "%c%s... Hoàn tất" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Hoàn tất" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2849,7 +2864,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2857,11 +2872,11 @@ msgstr "" "Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " "ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt." -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -3349,7 +3364,7 @@ msgstr "Chuẩn bị để lấy cách giải quyết" msgid "External solver failed without a proper error message" msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "Thi hành bộ phân giải từ bên ngoài" diff --git a/po/zh_CN.po b/po/zh_CN.po index 8c3120001..d4ec54b3d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -629,7 +629,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -807,7 +807,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116 msgid "Failed" msgstr "失败" @@ -1366,7 +1366,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" @@ -1393,59 +1393,64 @@ msgstr "查询" msgid "Unable to invoke " msgstr "无法调用 " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "正在连接 %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, 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:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "无法发起与 %s:%s (%s) 的连接" -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "无法连接上 %s:%s (%s)，连接超时" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, 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:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "无法解析域名“%s”" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "暂时不能解析域名“%s”" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s' (%s)" +msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)" + +#: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" @@ -1509,43 +1514,43 @@ msgstr "该 HTTP 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:823 +#: methods/http.cc:827 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:846 +#: methods/http.cc:850 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:877 +#: methods/http.cc:881 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:905 +#: methods/http.cc:909 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:919 +#: methods/http.cc:923 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:921 +#: methods/http.cc:925 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1194 +#: methods/http.cc:1198 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1211 methods/http.cc:1266 +#: methods/http.cc:1215 methods/http.cc:1270 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1358 +#: methods/http.cc:1362 msgid "Internal error" msgstr "内部错误" @@ -2347,6 +2352,16 @@ msgstr "%c%s... 有错误！" msgid "%c%s... Done" msgstr "%c%s... 完成" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... 完成" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@ -2739,7 +2754,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1228 +#: apt-pkg/algorithms.cc:1231 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2747,13 +2762,13 @@ msgstr "" "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1230 +#: apt-pkg/algorithms.cc:1233 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 +#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585 #, fuzzy msgid "" "Some index files failed to download. They have been ignored, or old ones " @@ -3219,7 +3234,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 4a8d6b9e8..47fa334ae 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-03-14 08:05+0100\n" +"POT-Creation-Date: 2013-03-24 08:53+0100\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] Date: Sun, 24 Mar 2013 08:58:27 +0100 Subject: * Update all PO files and apt-all.pot * French translation completed (Christian Perrier) --- debian/changelog | 8 ++++++++ po/fr.po | 16 +++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index a25507fc9..cf04c1dd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.7.9~exp2) UNRELEASED; urgency=low + + [ Programs translations ] + * Update all PO files and apt-all.pot + * French translation completed (Christian Perrier) + + -- Christian Perrier Sun, 24 Mar 2013 08:57:45 +0100 + apt (0.9.7.9~exp1) experimental; urgency=low [ Niels Thykier ] diff --git a/po/fr.po b/po/fr.po index 4d077d87a..129d70ba0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,13 +3,13 @@ # French messages # # Pierre Machard , 2002,2003,2004. -# Christian Perrier , 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. +# Christian Perrier , 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2013-03-24 08:53+0100\n" -"PO-Revision-Date: 2012-06-25 19:58+0200\n" +"PO-Revision-Date: 2013-03-24 08:57+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "Language: fr\n" @@ -1539,11 +1539,9 @@ msgid "Temporary failure resolving '%s'" msgstr "Erreur temporaire de résolution de « %s »" #: methods/connect.cc:209 -#, fuzzy, c-format +#, c-format msgid "System error resolving '%s:%s' (%s)" -msgstr "" -"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:" -"%s » (%i - %s)" +msgstr "Erreur système lors de la résolution de « %s:%s » (%s)" #: methods/connect.cc:211 #, c-format @@ -2491,13 +2489,13 @@ msgstr "%c%s... Fait" #: apt-pkg/contrib/progress.cc:179 msgid "..." -msgstr "" +msgstr "…" #. Print the spinner #: apt-pkg/contrib/progress.cc:195 -#, fuzzy, c-format +#, c-format msgid "%c%s... %u%%" -msgstr "%c%s... Fait" +msgstr "%c%s… %u%%" #: apt-pkg/contrib/cmndline.cc:80 #, c-format -- cgit v1.2.3 From c510253888191fe9537559ad2fdd982dc3fd89eb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Mar 2013 08:52:20 +0100 Subject: merge patch from Daniel Hartwig --- cmdline/apt-get.cc | 2 +- debian/changelog | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index e3c74a099..64b062ea4 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2714,7 +2714,7 @@ bool DoSource(CommandLine &CmdL) { string buildopts = _config->Find("APT::Get::Host-Architecture"); if (buildopts.empty() == false) - buildopts = "-a " + buildopts + " "; + buildopts = "-a" + buildopts + " "; buildopts.append(_config->Find("DPkg::Build-Options","-b -uc")); // Call dpkg-buildpackage diff --git a/debian/changelog b/debian/changelog index cf04c1dd2..fbc6009a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low [ Programs translations ] * Update all PO files and apt-all.pot * French translation completed (Christian Perrier) + + [ Daniel Hartwig ] + * cmdline/apt-get.cc: + - do not have space between "-a" and option when cross building + (closes: #703792) -- Christian Perrier Sun, 24 Mar 2013 08:57:45 +0100 -- cgit v1.2.3 From 2f8f21c3d494328f0b4a544998fc6118b25b56c3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Mar 2013 08:56:42 +0100 Subject: merge patches from daniel to fix merge artifact and test failure --- debian/changelog | 4 ++++ debian/control | 4 ++-- po/ca.po | 10 ++++++++++ po/cs.po | 10 ++++++++++ po/ru.po | 10 ++++++++++ test/integration/test-apt-get-download | 2 +- 6 files changed, 37 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fbc6009a1..558b657ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low * cmdline/apt-get.cc: - do not have space between "-a" and option when cross building (closes: #703792) + * test/integration/test-apt-get-download: + - fix test now that #1098752 is fixed + * po/{ca,cs,ru}.po: + - fix merge artifact -- Christian Perrier Sun, 24 Mar 2013 08:57:45 +0100 diff --git a/debian/control b/debian/control index 50b3599fc..762d2818e 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-wheezy/ -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-wheezy/ +Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ +Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any diff --git a/po/ca.po b/po/ca.po index 41488ba3c..0f3570949 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2438,6 +2438,16 @@ msgstr "" msgid "%c%s... %u%%" msgstr "%c%s… Fet" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "…" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." diff --git a/po/cs.po b/po/cs.po index cb260c621..6e9543939 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2416,6 +2416,16 @@ msgstr "" msgid "%c%s... %u%%" msgstr "%c%s… Hotovo" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "…" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." diff --git a/po/ru.po b/po/ru.po index 2a72ee3c1..703a83a7c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2474,6 +2474,16 @@ msgstr "" msgid "%c%s... %u%%" msgstr "%c%s… Готово" +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "…" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" + #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index b164f7dba..420b2e380 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -26,7 +26,7 @@ testdownload apt_1.0_all.deb apt stable testdownload apt_2.0_all.deb apt DEBFILE="$(readlink -f aptarchive)/pool/apt_2.0_all.deb" -testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) sha256:$(sha256sum $DEBFILE | cut -d' ' -f 1)" aptget download apt --print-uris +testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) sha512:$(sha512sum $DEBFILE | cut -d' ' -f 1)" aptget download apt --print-uris # deb:677887 testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms -- cgit v1.2.3 From 5cf466f44ef3eeefbdabc95e1b369bad8889f899 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Mar 2013 09:03:48 +0100 Subject: * methods/connect.cc: - use Errno() instead of strerror(), thanks to David Kalnischk --- debian/changelog | 4 ++++ methods/connect.cc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 558b657ce..840fd697c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,10 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low - fix test now that #1098752 is fixed * po/{ca,cs,ru}.po: - fix merge artifact + + [ Michael Vogt ] + * methods/connect.cc: + - use Errno() instead of strerror(), thanks to David Kalnischk -- Christian Perrier Sun, 24 Mar 2013 08:57:45 +0100 diff --git a/methods/connect.cc b/methods/connect.cc index 35f4723ce..fc7a72ee9 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -206,8 +206,8 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd, Host.c_str()); } if (Res == EAI_SYSTEM) - return _error->Error(_("System error resolving '%s:%s' (%s)"), - Host.c_str(),ServStr,strerror(errno)); + return _error->Errno("getaddrinfo", _("System error resolving '%s:%s'"), + Host.c_str(),ServStr); return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"), Host.c_str(),ServStr,Res,gai_strerror(Res)); } -- cgit v1.2.3 From 6db4e5c69fcf4ec5f5574b8465e9e0f20fc22e12 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Mar 2013 13:55:07 +0100 Subject: * doc/apt.conf.5.xml: - document Acquire::ForceIPv{4,6} --- debian/changelog | 2 ++ doc/apt.conf.5.xml | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 840fd697c..21e76c818 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low [ Michael Vogt ] * methods/connect.cc: - use Errno() instead of strerror(), thanks to David Kalnischk + * doc/apt.conf.5.xml: + - document Acquire::ForceIPv{4,6} -- Christian Perrier Sun, 24 Mar 2013 08:57:45 +0100 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 6a61acd2d..be1d7ade8 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -554,6 +554,18 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; + + + When downloading, force to use only the IPv4 protocol. + + + + + + When downloading, force to use only the IPv6 protocol. + + + -- cgit v1.2.3 From 40befb065d110c7b3a7b3d37759b6888522817b2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 1 Apr 2013 13:19:43 +0200 Subject: * apt-pkg/deb/debversion.cc: - add a string-equal shortcut for equal version comparisions --- apt-pkg/deb/debversion.cc | 15 ++++++++++++--- debian/changelog | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index a02699a44..94d357846 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -215,10 +215,19 @@ bool debVersioningSystem::CheckDep(const char *PkgVer, return true; if (PkgVer == 0 || PkgVer[0] == 0) return false; - + Op &= 0x0F; + + size_t const lenPkgVer = strlen(PkgVer); + size_t const lenDepVer = strlen(DepVer); + + // take a shortcut for equals which are string-equal as well + if (Op == pkgCache::Dep::Equals && lenPkgVer == lenDepVer && + memcmp(PkgVer, DepVer, lenPkgVer) == 0) + return true; + // Perform the actual comparision. - int Res = CmpVersion(PkgVer,DepVer); - switch (Op & 0x0F) + int const Res = DoCmpVersion(PkgVer, PkgVer + lenPkgVer, DepVer, DepVer + lenDepVer); + switch (Op) { case pkgCache::Dep::LessEq: if (Res <= 0) diff --git a/debian/changelog b/debian/changelog index 7796f5920..b0e669129 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.9.7.8~exp2+nmu1) UNRELEASED; urgency=low - handle language tags for descriptions are unique strings to be shared - factor version string creation out of NewDepends, so we can easily reuse version strings e.g. for implicit multi-arch dependencies + * apt-pkg/deb/debversion.cc: + - add a string-equal shortcut for equal version comparisions -- David Kalnischkies Sun, 10 Mar 2013 12:23:24 +0100 -- cgit v1.2.3 From b8a884c0c7d5f670179a82984289140a9f432729 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 1 Apr 2013 15:41:02 +0200 Subject: equal comparisions are used mostly in same-source relations, so use this to try to reuse some version strings --- apt-pkg/pkgcachegen.cc | 20 ++++++++++++++------ debian/changelog | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 01aaf6164..b11ddcf9e 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -864,12 +864,20 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, map_ptrloc index = 0; if (Version.empty() == false) { - void const * const oldMap = Map.Data(); - index = WriteStringInMap(Version); - if (unlikely(index == 0)) - return false; - if (oldMap != Map.Data()) - OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + int const CmpOp = Op & 0x0F; + // =-deps are used (79:1) for lockstep on same-source packages (e.g. data-packages) + if (CmpOp == pkgCache::Dep::Equals && strcmp(Version.c_str(), Ver.VerStr()) == 0) + index = Ver->VerStr; + + if (index == 0) + { + void const * const oldMap = Map.Data(); + index = WriteStringInMap(Version); + if (unlikely(index == 0)) + return false; + if (oldMap != Map.Data()) + OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + } } return NewDepends(Pkg, Ver, index, Op, Type, OldDepLast); } diff --git a/debian/changelog b/debian/changelog index b0e669129..d9183db98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.9.7.8~exp2+nmu1) UNRELEASED; urgency=low - handle language tags for descriptions are unique strings to be shared - factor version string creation out of NewDepends, so we can easily reuse version strings e.g. for implicit multi-arch dependencies + - equal comparisions are used mostly in same-source relations, + so use this to try to reuse some version strings * apt-pkg/deb/debversion.cc: - add a string-equal shortcut for equal version comparisions -- cgit v1.2.3 From d9682cf8268d6c69e41adb6be9f03d68ba066a12 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 1 Apr 2013 23:27:16 +0200 Subject: micro-optimize and enhance readability of ListParser::VersionHash --- apt-pkg/deb/deblistparser.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 56d5297fc..67f0ac9c6 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -284,7 +284,7 @@ unsigned short debListParser::VersionHash() "Replaces",0}; unsigned long Result = INIT_FCS; char S[1024]; - for (const char **I = Sections; *I != 0; I++) + for (const char * const *I = Sections; *I != 0; ++I) { const char *Start; const char *End; @@ -295,13 +295,13 @@ unsigned short debListParser::VersionHash() of certain fields. dpkg also has the rather interesting notion of reformatting depends operators < -> <= */ char *J = S; - for (; Start != End; Start++) + for (; Start != End; ++Start) { - if (isspace(*Start) == 0) - *J++ = tolower_ascii(*Start); - if (*Start == '<' && Start[1] != '<' && Start[1] != '=') - *J++ = '='; - if (*Start == '>' && Start[1] != '>' && Start[1] != '=') + if (isspace(*Start) != 0) + continue; + *J++ = tolower_ascii(*Start); + + if ((*Start == '<' || *Start == '>') && Start[1] != *Start && Start[1] != '=') *J++ = '='; } -- cgit v1.2.3 From bc65130d13c2737aefb85e609f67be196ae10a7f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Apr 2013 15:08:34 +0200 Subject: po/{ca,cs,ru}.po: fix merge artifacts harder --- po/ca.po | 10 ---------- po/cs.po | 10 ---------- po/ru.po | 10 ---------- 3 files changed, 30 deletions(-) diff --git a/po/ca.po b/po/ca.po index 0f3570949..64af4e6f4 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2428,16 +2428,6 @@ msgstr "%c%s… Error!" msgid "%c%s... Done" msgstr "%c%s… Fet" -#: apt-pkg/contrib/progress.cc:179 -msgid "..." -msgstr "" - -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s… Fet" - #: apt-pkg/contrib/progress.cc:179 msgid "..." msgstr "…" diff --git a/po/cs.po b/po/cs.po index 6e9543939..df8f64b31 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2406,16 +2406,6 @@ msgstr "%c%s… Chyba!" msgid "%c%s... Done" msgstr "%c%s… Hotovo" -#: apt-pkg/contrib/progress.cc:179 -msgid "..." -msgstr "" - -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s… Hotovo" - #: apt-pkg/contrib/progress.cc:179 msgid "..." msgstr "…" diff --git a/po/ru.po b/po/ru.po index 703a83a7c..488881aa5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2464,16 +2464,6 @@ msgstr "%c%s… Ошибка!" msgid "%c%s... Done" msgstr "%c%s… Готово" -#: apt-pkg/contrib/progress.cc:179 -msgid "..." -msgstr "" - -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s… Готово" - #: apt-pkg/contrib/progress.cc:179 msgid "..." msgstr "…" -- cgit v1.2.3 From aa0fe657e46b87cc692895a36df12e8b74bb27bb Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 3 Apr 2013 12:44:36 +0200 Subject: - sort group and package names in the hashtable on insert * apt-pkg/pkgcache.cc: - assume sorted hashtable entries for groups/packages --- apt-pkg/pkgcache.cc | 31 ++++++++++++++++++++----------- apt-pkg/pkgcachegen.cc | 16 +++++++++++----- debian/changelog | 3 +++ 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 1378876fe..879f34099 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -52,7 +52,7 @@ pkgCache::Header::Header() /* Whenever the structures change the major version should be bumped, whenever the generator changes the minor version should be bumped. */ MajorVersion = 8; - MinorVersion = 0; + MinorVersion = 1; Dirty = false; HeaderSz = sizeof(pkgCache::Header); @@ -182,18 +182,17 @@ unsigned long pkgCache::sHash(const string &Str) const { unsigned long Hash = 0; for (string::const_iterator I = Str.begin(); I != Str.end(); ++I) - Hash = 5*Hash + tolower_ascii(*I); + Hash = 41 * Hash + tolower_ascii(*I); return Hash % _count(HeaderP->PkgHashTable); } unsigned long pkgCache::sHash(const char *Str) const { - unsigned long Hash = 0; - for (const char *I = Str; *I != 0; ++I) - Hash = 5*Hash + tolower_ascii(*I); + unsigned long Hash = tolower_ascii(*Str); + for (const char *I = Str + 1; *I != 0; ++I) + Hash = 41 * Hash + tolower_ascii(*I); return Hash % _count(HeaderP->PkgHashTable); } - /*}}}*/ // Cache::SingleArchFindPkg - Locate a package by name /*{{{*/ // --------------------------------------------------------------------- @@ -206,9 +205,14 @@ pkgCache::PkgIterator pkgCache::SingleArchFindPkg(const string &Name) Package *Pkg = PkgP + HeaderP->PkgHashTable[Hash(Name)]; for (; Pkg != PkgP; Pkg = PkgP + Pkg->NextPackage) { - if (Pkg->Name != 0 && StrP[Pkg->Name] == Name[0] && - stringcasecmp(Name,StrP + Pkg->Name) == 0) - return PkgIterator(*this,Pkg); + if (unlikely(Pkg->Name == 0)) + continue; + + int const cmp = strcasecmp(Name.c_str(), StrP + Pkg->Name); + if (cmp == 0) + return PkgIterator(*this, Pkg); + else if (cmp < 0) + break; } return PkgIterator(*this,0); } @@ -265,9 +269,14 @@ pkgCache::GrpIterator pkgCache::FindGrp(const string &Name) { // Look at the hash bucket for the group Group *Grp = GrpP + HeaderP->GrpHashTable[sHash(Name)]; for (; Grp != GrpP; Grp = GrpP + Grp->Next) { - if (Grp->Name != 0 && StrP[Grp->Name] == Name[0] && - stringcasecmp(Name, StrP + Grp->Name) == 0) + if (unlikely(Grp->Name == 0)) + continue; + + int const cmp = strcasecmp(Name.c_str(), StrP + Grp->Name); + if (cmp == 0) return GrpIterator(*this, Grp); + else if (cmp < 0) + break; } return GrpIterator(*this,0); diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index b11ddcf9e..8437dc68f 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -595,8 +595,11 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) // Insert it into the hash table unsigned long const Hash = Cache.Hash(Name); - Grp->Next = Cache.HeaderP->GrpHashTable[Hash]; - Cache.HeaderP->GrpHashTable[Hash] = Group; + map_ptrloc *insertAt = &Cache.HeaderP->GrpHashTable[Hash]; + while (*insertAt != 0 && strcasecmp(Name.c_str(), Cache.StrP + (Cache.GrpP + *insertAt)->Name) > 0) + insertAt = &(Cache.GrpP + *insertAt)->Next; + Grp->Next = *insertAt; + *insertAt = Group; Grp->ID = Cache.HeaderP->GroupCount++; return true; @@ -625,11 +628,14 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name // Insert the package into our package list if (Grp->FirstPackage == 0) // the group is new { + Grp->FirstPackage = Package; // Insert it into the hash table unsigned long const Hash = Cache.Hash(Name); - Pkg->NextPackage = Cache.HeaderP->PkgHashTable[Hash]; - Cache.HeaderP->PkgHashTable[Hash] = Package; - Grp->FirstPackage = Package; + map_ptrloc *insertAt = &Cache.HeaderP->PkgHashTable[Hash]; + while (*insertAt != 0 && strcasecmp(Name.c_str(), Cache.StrP + (Cache.PkgP + *insertAt)->Name) > 0) + insertAt = &(Cache.PkgP + *insertAt)->NextPackage; + Pkg->NextPackage = *insertAt; + *insertAt = Package; } else // Group the Packages together { diff --git a/debian/changelog b/debian/changelog index d9183db98..d4f0e4bb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ apt (0.9.7.8~exp2+nmu1) UNRELEASED; urgency=low version strings e.g. for implicit multi-arch dependencies - equal comparisions are used mostly in same-source relations, so use this to try to reuse some version strings + - sort group and package names in the hashtable on insert + * apt-pkg/pkgcache.cc: + - assume sorted hashtable entries for groups/packages * apt-pkg/deb/debversion.cc: - add a string-equal shortcut for equal version comparisions -- cgit v1.2.3 From 463f24f99f6cca2df71e7ec0568a6bdcd78cf9ed Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 3 Apr 2013 14:19:34 +0200 Subject: apt-pkg/contrib/gpgv.cc: fix InRelease check --- apt-pkg/contrib/gpgv.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc index ba059dd87..31db7d5fe 100644 --- a/apt-pkg/contrib/gpgv.cc +++ b/apt-pkg/contrib/gpgv.cc @@ -337,8 +337,8 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile, if (first_line == true && found_message_start == false && found_message_end == false) return false; // otherwise one missing indicates a syntax error - else if (first_line == false || found_message_start == false || found_message_end == false) - return _error->Error("Splitting of file %s failed as it doesn't contain all expected parts", InFile.c_str()); + else if (first_line == true || found_message_start == false || found_message_end == false) + return _error->Error("Splitting of file %s failed as it doesn't contain all expected parts %i %i %i", InFile.c_str(), first_line, found_message_start, found_message_end); return true; } -- cgit v1.2.3 From d4d508e3a3fea43d6f856770bd411ba1e927858f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 3 Apr 2013 14:39:40 +0200 Subject: po/*: refreshed --- po/apt-all.pot | 4 ++-- po/ar.po | 2 +- po/ast.po | 2 +- po/bg.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/dz.po | 2 +- po/el.po | 2 +- po/es.po | 2 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/km.po | 2 +- po/ko.po | 2 +- po/ku.po | 2 +- po/lt.po | 2 +- po/mr.po | 2 +- po/nb.po | 2 +- po/ne.po | 2 +- po/nl.po | 2 +- po/nn.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sv.po | 2 +- po/th.po | 2 +- po/tl.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 43 files changed, 44 insertions(+), 44 deletions(-) diff --git a/po/apt-all.pot b/po/apt-all.pot index 8ff4bb5f5..4703792d7 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 0.9.7.9~exp1\n" +"Project-Id-Version: apt 0.9.7.9~exp2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ar.po b/po/ar.po index f61ab4288..1b56be6c7 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" diff --git a/po/ast.po b/po/ast.po index dfdf26fdf..25388ddbb 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" diff --git a/po/bg.po b/po/bg.po index f302170a3..7378aae74 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" diff --git a/po/bs.po b/po/bs.po index 2e2dd1192..4b4cb478d 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" diff --git a/po/ca.po b/po/ca.po index b99734771..ddbaf731a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" diff --git a/po/cs.po b/po/cs.po index 5c17539b8..ffe773302 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" diff --git a/po/cy.po b/po/cy.po index 82abc9ae7..ae7173a40 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" diff --git a/po/da.po b/po/da.po index 9f98df6a7..db109ad0f 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-07-03 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index ac0ca11bb..276c0def7 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" diff --git a/po/dz.po b/po/dz.po index ac74061df..82257ac5e 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" diff --git a/po/el.po b/po/el.po index 8dea2d551..1fcf3303a 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης \n" "Language-Team: Greek \n" diff --git a/po/es.po b/po/es.po index 8209ac977..0307f0558 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña \n" "Language-Team: Debian Spanish \n" diff --git a/po/eu.po b/po/eu.po index 993e427cd..083704182 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" diff --git a/po/fi.po b/po/fi.po index 4c29cf2ca..0157fcf3b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 97ff54fc2..7fed47867 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2013-03-24 08:57+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" diff --git a/po/gl.po b/po/gl.po index 821227308..0ce8a5354 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" diff --git a/po/hu.po b/po/hu.po index 34ddd7609..a5714f56d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" diff --git a/po/it.po b/po/it.po index c8a1b87c6..18613cd41 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-06-25 21:54+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" diff --git a/po/ja.po b/po/ja.po index a88723134..7f02fa9af 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-07-01 00:14+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" diff --git a/po/km.po b/po/km.po index 6e938ff07..e6048afdc 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" diff --git a/po/ko.po b/po/ko.po index 9d84ac236..7cfbbc32c 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" diff --git a/po/ku.po b/po/ku.po index 6f1e31484..bc2725550 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" diff --git a/po/lt.po b/po/lt.po index d8e989382..d6a7cc6e4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" diff --git a/po/mr.po b/po/mr.po index 300573bd1..9bb37debd 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " diff --git a/po/nb.po b/po/nb.po index 99544811d..1934a25c8 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" diff --git a/po/ne.po b/po/ne.po index d24645449..66064f559 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" diff --git a/po/nl.po b/po/nl.po index 4e4384919..408ce4b8b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" diff --git a/po/nn.po b/po/nn.po index 1b1eb7fd3..768999104 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" diff --git a/po/pl.po b/po/pl.po index 218b37693..61c3cd2b3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index 073a34c0b..542e1efba 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index b4ecf3ed0..86a90305b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" diff --git a/po/ru.po b/po/ru.po index 73fed5e39..c33fb9844 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" diff --git a/po/sk.po b/po/sk.po index d90f50995..883ad8b2f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" diff --git a/po/sl.po b/po/sl.po index ff4a0f09b..1a0155f39 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" diff --git a/po/sv.po b/po/sv.po index 04a75e602..021578ace 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff --git a/po/th.po b/po/th.po index cfa65481b..5e2f51c1e 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" diff --git a/po/tl.po b/po/tl.po index 19ef31f20..fd21cdeeb 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" diff --git a/po/uk.po b/po/uk.po index 6fa9320c9..0dac6fb6d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" diff --git a/po/vi.po b/po/vi.po index b81b8453a..ec6fdc6fc 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2012-11-20 14:12+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 841087b48..b5e3a8c2a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 28f0c6545..31d72e553 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0200\n" +"POT-Creation-Date: 2013-04-03 14:20+0200\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] Date: Wed, 3 Apr 2013 14:40:08 +0200 Subject: releasing version 0.9.7.9~exp2 --- configure.in | 2 +- debian/changelog | 4 ++-- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index f3a365ded..0e2ced4fd 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.7.9~exp2~20130402" +PACKAGE_VERSION="0.9.7.9~exp2" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index 239fb308c..42874ac53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.9.7.9~exp2) UNRELEASED; urgency=low +apt (0.9.7.9~exp2) experimental; urgency=low [ Programs translations ] * Update all PO files and apt-all.pot @@ -43,7 +43,7 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low * doc/apt.conf.5.xml: - document Acquire::ForceIPv{4,6} - -- Michael Vogt Tue, 02 Apr 2013 15:13:50 +0200 + -- Michael Vogt Wed, 03 Apr 2013 14:19:58 +0200 apt (0.9.7.9~exp1) experimental; urgency=low diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 240b368b0..ff8f3485d 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -213,7 +213,7 @@ "> - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index fae040cd5..e23f5699f 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.7.9~exp1\n" +"Project-Id-Version: apt-doc 0.9.7.9~exp2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-04-02 15:13+0300\n" +"POT-Creation-Date: 2013-04-03 14:20+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3 From 887c6940d2afc9e3110f226e4d95fc72640e3ad6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 3 Apr 2013 19:34:47 +0200 Subject: * apt-pkg/cacheiterators.h: - provide DepIterator::IsSatisfied as a nicer shorthand for DepCheck --- apt-pkg/cacheiterators.h | 2 ++ apt-pkg/depcache.cc | 25 ++++++++++--------------- apt-pkg/pkgcache.cc | 16 ++++++++++++---- debian/changelog | 2 ++ 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index dcd353119..179a0e963 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -286,6 +286,8 @@ class pkgCache::DepIterator : public Iterator { bool IsIgnorable(PrvIterator const &Prv) const; bool IsIgnorable(PkgIterator const &Pkg) const; bool IsMultiArchImplicit() const; + bool IsSatisfied(VerIterator const &Ver) const; + bool IsSatisfied(PrvIterator const &Prv) const; void GlobOr(DepIterator &Start,DepIterator &End); Version **AllTargets() const; bool SmartTargetPkg(PkgIterator &Result) const; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index a48cd8b0c..6a3e9bfc4 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -351,18 +351,15 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) PkgIterator Pkg = Dep.TargetPkg(); // Check the base package if (Type == NowVersion && Pkg->CurrentVer != 0) - if (VS().CheckDep(Pkg.CurrentVer().VerStr(),Dep->CompareOp, - Dep.TargetVer()) == true) + if (Dep.IsSatisfied(Pkg.CurrentVer()) == true) return true; if (Type == InstallVersion && PkgState[Pkg->ID].InstallVer != 0) - if (VS().CheckDep(PkgState[Pkg->ID].InstVerIter(*this).VerStr(), - Dep->CompareOp,Dep.TargetVer()) == true) + if (Dep.IsSatisfied(PkgState[Pkg->ID].InstVerIter(*this)) == true) return true; if (Type == CandidateVersion && PkgState[Pkg->ID].CandidateVer != 0) - if (VS().CheckDep(PkgState[Pkg->ID].CandidateVerIter(*this).VerStr(), - Dep->CompareOp,Dep.TargetVer()) == true) + if (Dep.IsSatisfied(PkgState[Pkg->ID].CandidateVerIter(*this)) == true) return true; } @@ -398,7 +395,7 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) } // Compare the versions. - if (VS().CheckDep(P.ProvideVersion(),Dep->CompareOp,Dep.TargetVer()) == true) + if (Dep.IsSatisfied(P) == true) { Res = P.OwnerPkg(); return true; @@ -1192,14 +1189,13 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, { APT::VersionList verlist; pkgCache::VerIterator Cand = PkgState[Start.TargetPkg()->ID].CandidateVerIter(*this); - if (Cand.end() == false && VS().CheckDep(Cand.VerStr(), Start->CompareOp, Start.TargetVer()) == true) + if (Cand.end() == false && Start.IsSatisfied(Cand) == true) verlist.insert(Cand); for (PrvIterator Prv = Start.TargetPkg().ProvidesList(); Prv.end() != true; ++Prv) { pkgCache::VerIterator V = Prv.OwnerVer(); pkgCache::VerIterator Cand = PkgState[Prv.OwnerPkg()->ID].CandidateVerIter(*this); - if (Cand.end() == true || V != Cand || - VS().CheckDep(Prv.ProvideVersion(), Start->CompareOp, Start.TargetVer()) == false) + if (Cand.end() == true || V != Cand || Start.IsSatisfied(Prv) == false) continue; verlist.insert(Cand); } @@ -1407,7 +1403,7 @@ bool pkgDepCache::SetCandidateRelease(pkgCache::VerIterator TargetVer, if (Cand.end() == true) continue; // check if the current candidate is enough for the versioned dependency - and installable? - if (VS().CheckDep(P.CandVersion(), Start->CompareOp, Start.TargetVer()) == true && + if (Start.IsSatisfied(Cand) == true && (VersionState(Cand.DependsList(), DepInstall, DepCandMin, DepCandPolicy) & DepCandMin) == DepCandMin) { itsFine = true; @@ -1441,7 +1437,7 @@ bool pkgDepCache::SetCandidateRelease(pkgCache::VerIterator TargetVer, V = Match.Find(D.TargetPkg()); // check if the version from this release could satisfy the dependency - if (V.end() == true || VS().CheckDep(V.VerStr(), D->CompareOp, D.TargetVer()) == false) + if (V.end() == true || D.IsSatisfied(V) == false) { if (stillOr == true) continue; @@ -1771,7 +1767,7 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, for(VerIterator V = d.TargetPkg().VersionList(); !V.end(); ++V) { - if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer())) + if(d.IsSatisfied(V)) { if(debug_autoremove) { @@ -1793,8 +1789,7 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, for(PrvIterator prv=d.TargetPkg().ProvidesList(); !prv.end(); ++prv) { - if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp, - d.TargetVer())) + if(d.IsSatisfied(prv)) { if(debug_autoremove) { diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 879f34099..d7725563b 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -634,8 +634,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() const { if (IsIgnorable(I.ParentPkg()) == true) continue; - - if (Owner->VS->CheckDep(I.VerStr(),S->CompareOp,TargetVer()) == false) + if (IsSatisfied(I) == false) continue; Size++; @@ -648,8 +647,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() const { if (IsIgnorable(I) == true) continue; - - if (Owner->VS->CheckDep(I.ProvideVersion(),S->CompareOp,TargetVer()) == false) + if (IsSatisfied(I) == false) continue; Size++; @@ -757,6 +755,16 @@ bool pkgCache::DepIterator::IsMultiArchImplicit() const return false; } /*}}}*/ +// DepIterator::IsSatisfied - check if a version satisfied the dependency /*{{{*/ +bool pkgCache::DepIterator::IsSatisfied(VerIterator const &Ver) const +{ + return Owner->VS->CheckDep(Ver.VerStr(),S->CompareOp,TargetVer()); +} +bool pkgCache::DepIterator::IsSatisfied(PrvIterator const &Prv) const +{ + return Owner->VS->CheckDep(Prv.ProvideVersion(),S->CompareOp,TargetVer()); +} + /*}}}*/ // ostream operator to handle string representation of a dependecy /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/debian/changelog b/debian/changelog index d4f0e4bb3..7070c5fc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ apt (0.9.7.8~exp2+nmu1) UNRELEASED; urgency=low - sort group and package names in the hashtable on insert * apt-pkg/pkgcache.cc: - assume sorted hashtable entries for groups/packages + * apt-pkg/cacheiterators.h: + - provide DepIterator::IsSatisfied as a nicer shorthand for DepCheck * apt-pkg/deb/debversion.cc: - add a string-equal shortcut for equal version comparisions -- cgit v1.2.3 From 885594fc8831d1be5a254557385e3dbefb564fbf Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 3 Apr 2013 19:43:03 +0200 Subject: share version strings between same versions (of different architectures) to save some space and allow quick comparisions later on --- apt-pkg/deb/debversion.cc | 12 ++++-------- apt-pkg/pkgcachegen.cc | 37 +++++++++++++++++++++++++++++++------ apt-pkg/pkgcachegen.h | 6 +++++- debian/changelog | 2 ++ 4 files changed, 42 insertions(+), 15 deletions(-) diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index 94d357846..140561262 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -217,16 +217,12 @@ bool debVersioningSystem::CheckDep(const char *PkgVer, return false; Op &= 0x0F; - size_t const lenPkgVer = strlen(PkgVer); - size_t const lenDepVer = strlen(DepVer); - - // take a shortcut for equals which are string-equal as well - if (Op == pkgCache::Dep::Equals && lenPkgVer == lenDepVer && - memcmp(PkgVer, DepVer, lenPkgVer) == 0) - return true; + // fast track for (equal) strings [by location] which are by definition equal versions + if (PkgVer == DepVer) + return Op == pkgCache::Dep::Equals || Op == pkgCache::Dep::LessEq || Op == pkgCache::Dep::GreaterEq; // Perform the actual comparision. - int const Res = DoCmpVersion(PkgVer, PkgVer + lenPkgVer, DepVer, DepVer + lenDepVer); + int const Res = CmpVersion(PkgVer, DepVer); switch (Op) { case pkgCache::Dep::LessEq: diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 8437dc68f..3f10b6c40 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -390,7 +390,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator } // Add a new version - map_ptrloc const verindex = NewVersion(Ver,Version,*LastVer); + map_ptrloc const verindex = NewVersion(Ver, Version, Pkg.Index(), Hash, *LastVer); if (verindex == 0 && _error->PendingError()) return _error->Error(_("Error occurred while processing %s (%s%d)"), Pkg.Name(), "NewVersion", 1); @@ -398,8 +398,6 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator if (oldMap != Map.Data()) LastVer += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; *LastVer = verindex; - Ver->ParentPkg = Pkg.Index(); - Ver->Hash = Hash; if (unlikely(List.NewVersion(Ver) == false)) return _error->Error(_("Error occurred while processing %s (%s%d)"), @@ -557,7 +555,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) Dynamic DynVer(Ver); for (; Ver.end() == false; ++Ver) { - if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr()) + if (Ver->Hash == Hash && Version == Ver.VerStr()) { if (List.CollectFileProvides(Cache,Ver) == false) return _error->Error(_("Error occurred while processing %s (%s%d)"), @@ -768,6 +766,8 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver, /* This puts a version structure in the linked list */ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, const string &VerStr, + map_ptrloc const ParentPkg, + unsigned long const Hash, unsigned long Next) { // Get a structure @@ -779,12 +779,37 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version); //Dynamic DynV(Ver); // caller MergeListVersion already takes care of it Ver->NextVer = Next; + Ver->ParentPkg = ParentPkg; + Ver->Hash = Hash; Ver->ID = Cache.HeaderP->VersionCount++; + + // try to find the version string in the group for reuse + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + pkgCache::GrpIterator Grp = Pkg.Group(); + if (Pkg.end() == false && Grp.end() == false) + { + for (pkgCache::PkgIterator P = Grp.PackageList(); P.end() == false; P = Grp.NextPkg(P)) + { + if (Pkg == P) + continue; + for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; ++V) + { + int const cmp = strcmp(V.VerStr(), VerStr.c_str()); + if (cmp == 0) + { + Ver->VerStr = V->VerStr; + return Version; + } + else if (cmp < 0) + break; + } + } + } + // haven't found the version string, so create map_ptrloc const idxVerStr = WriteStringInMap(VerStr); if (unlikely(idxVerStr == 0)) return 0; Ver->VerStr = idxVerStr; - return Version; } /*}}}*/ @@ -881,7 +906,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, index = WriteStringInMap(Version); if (unlikely(index == 0)) return false; - if (oldMap != Map.Data()) + if (OldDepLast != 0 && oldMap != Map.Data()) OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; } } diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index e759cbd3e..428e8459b 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -80,7 +80,11 @@ class pkgCacheGenerator /*{{{*/ bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver, map_ptrloc const Version, unsigned int const &Op, unsigned int const &Type, map_ptrloc* &OldDepLast); - unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,unsigned long Next); + __deprecated unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,unsigned long Next) + { return NewVersion(Ver, VerStr, 0, 0, Next); } + unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr, + map_ptrloc const ParentPkg, unsigned long const Hash, + unsigned long Next); map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang,const MD5SumValue &md5sum,map_ptrloc Next); public: diff --git a/debian/changelog b/debian/changelog index 7070c5fc9..9fce4b14e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ apt (0.9.7.8~exp2+nmu1) UNRELEASED; urgency=low - equal comparisions are used mostly in same-source relations, so use this to try to reuse some version strings - sort group and package names in the hashtable on insert + - share version strings between same versions (of different architectures) + to save some space and allow quick comparisions later on * apt-pkg/pkgcache.cc: - assume sorted hashtable entries for groups/packages * apt-pkg/cacheiterators.h: -- cgit v1.2.3 From 125bf7824a869e91dd6a134636918a18423eb87d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 4 Apr 2013 18:22:16 +0200 Subject: * apt-pkg/sourcelist.cc: - fix segfault when a hostname contains a [, thanks to Tzafrir Cohen (closes: #704653) --- apt-pkg/sourcelist.cc | 6 +++++- debian/changelog | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 0fddfb451..0fd237cad 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -270,7 +270,11 @@ bool pkgSourceList::ReadAppend(string File) // CNC:2003-02-20 - Do not break if '#' is inside []. for (I = Buffer; *I != 0 && *I != '#'; I++) if (*I == '[') - I = strchr(I + 1, ']'); + { + char *b_end = strchr(I + 1, ']'); + if (b_end != NULL) + I = b_end; + } *I = 0; const char *C = _strstrip(Buffer); diff --git a/debian/changelog b/debian/changelog index 42874ac53..5701cfeb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.9.7.9~exp3) UNRELEASED; urgency=low + + * apt-pkg/sourcelist.cc: + - fix segfault when a hostname contains a [, thanks to + Tzafrir Cohen (closes: #704653) + + -- Michael Vogt Thu, 04 Apr 2013 18:21:06 +0200 + apt (0.9.7.9~exp2) experimental; urgency=low [ Programs translations ] -- cgit v1.2.3 From b57220d815aedbc023847d0885e08c6ed50e629a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Apr 2013 08:41:51 +0200 Subject: * debian/control: - replace manpages-it (closes: #704723) --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5701cfeb0..87fe0bb04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.9.7.9~exp3) UNRELEASED; urgency=low * apt-pkg/sourcelist.cc: - fix segfault when a hostname contains a [, thanks to Tzafrir Cohen (closes: #704653) + * debian/control: + - replace manpages-it (closes: #704723) -- Michael Vogt Thu, 04 Apr 2013 18:21:06 +0200 diff --git a/debian/control b/debian/control index 762d2818e..49647340a 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg -Replaces: manpages-pl (<< 20060617-3~) +Replaces: manpages-pl (<< 20060617-3~), manpages-it Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt Description: commandline package manager -- cgit v1.2.3