From 4faff53f166c1755a05d2509b44f22b1a326efb7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Jul 2008 20:03:51 +0200 Subject: * apt-pkg/depcache.cc: - when checking for new important deps, skip critical ones (closes: #485943) --- apt-pkg/depcache.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index d1bea4cf..d8b4dc6d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -914,8 +914,9 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, { //FIXME: deal better with or-groups(?) DepIterator LocalStart = D; - - if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg()) + + if(IsImportantDep(D) && !D.IsCritical() && + Start.TargetPkg() == D.TargetPkg()) { if(!isPreviouslySatisfiedImportantDep) { -- cgit v1.2.3 From e01c08b0206b54c2d977a360beab2d72cf079f0c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Jul 2008 20:21:53 +0200 Subject: * improve apt progress reporting, display trigger actions --- apt-pkg/deb/dpkgpm.cc | 42 ++++++++++++++- apt-pkg/deb/dpkgpm.h | 2 + debian/changelog | 2 + po/apt-all.pot | 73 +++++++++++++++----------- po/ar.po | 73 +++++++++++++++----------- po/bg.po | 73 +++++++++++++++----------- po/bs.po | 73 +++++++++++++++----------- po/ca.po | 73 +++++++++++++++----------- po/cs.po | 73 +++++++++++++++----------- po/cy.po | 73 +++++++++++++++----------- po/da.po | 73 +++++++++++++++----------- po/de.po | 73 +++++++++++++++----------- po/dz.po | 73 +++++++++++++++----------- po/el.po | 73 +++++++++++++++----------- po/en_GB.po | 73 +++++++++++++++----------- po/es.po | 73 +++++++++++++++----------- po/eu.po | 73 +++++++++++++++----------- po/fi.po | 73 +++++++++++++++----------- po/fr.po | 143 +++++++++++++++++++++++++++++++------------------- po/gl.po | 73 +++++++++++++++----------- po/he.po | 73 +++++++++++++++----------- po/hu.po | 73 +++++++++++++++----------- po/it.po | 73 +++++++++++++++----------- po/ja.po | 73 +++++++++++++++----------- po/km.po | 73 +++++++++++++++----------- po/ko.po | 73 +++++++++++++++----------- po/ku.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 | 73 +++++++++++++++----------- po/sk.po | 73 +++++++++++++++----------- po/sl.po | 73 +++++++++++++++----------- po/sv.po | 75 +++++++++++++++----------- 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 +++++++++++++++----------- 46 files changed, 1898 insertions(+), 1359 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index bc15b881..77143e67 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -333,6 +333,12 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data and conffile-prompt like this 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited + + Newer versions of dpkg sent also: + 'processing: install: pkg' + 'processing: configure: pkg' + 'processing: remove: pkg' + 'processing: trigproc: trigger' */ char* list[5]; @@ -351,6 +357,34 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) char *pkg = list[1]; char *action = _strstrip(list[2]); + // 'processing' from dpkg looks like + // 'processing: action: pkg' + if(strncmp(list[0], "processing", strlen("processing")) == 0) + { + char s[200]; + map::iterator iter; + char *pkg_or_trigger = _strstrip(list[2]); + action =_strstrip( list[1]); + iter = PackageProcessingOps.find(action); + if(iter == PackageProcessingOps.end()) + { + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "ignoring unknwon action: " << action << std::endl; + return; + } + snprintf(s, sizeof(s), _(iter->second.c_str()), pkg_or_trigger); + + status << "pmstatus:" << pkg_or_trigger + << ":" << (PackagesDone/float(PackagesTotal)*100.0) + << ":" << s + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + return; + } + if(strncmp(action,"error",strlen("error")) == 0) { status << "pmerror:" << list[1] @@ -526,7 +560,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false) return false; - + // map the dpkg states to the operations that are performed // (this is sorted in the same way as Item::Ops) static const struct DpkgState DpkgStatesOpMap[][7] = { @@ -566,6 +600,12 @@ bool pkgDPkgPM::Go(int OutStatusFd) }, }; + // populate the "processing" map + PackageProcessingOps.insert( make_pair("install",N_("Installing %s")) ); + PackageProcessingOps.insert( make_pair("configure",N_("Configuring %s")) ); + PackageProcessingOps.insert( make_pair("remove",N_("Removing %s")) ); + PackageProcessingOps.insert( make_pair("trigproc",N_("Running post-installation trigger %s")) ); + // init the PackageOps map, go over the list of packages that // that will be [installed|configured|removed|purged] and add // them to the PackageOps map (the dpkg states it goes through) diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index ebc7e32b..44946912 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -47,6 +47,8 @@ class pkgDPkgPM : public pkgPackageManager // the int is the state that is already done (e.g. a package that is // going to be install is already in state "half-installed") map PackageOpsDone; + // map the dpkg "processing" info to human readable names + map PackageProcessingOps; // progress reporting unsigned int PackagesDone; unsigned int PackagesTotal; diff --git a/debian/changelog b/debian/changelog index 8bc57763..35b447dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ apt (0.7.15) UNRELEASED; urgency=low * apt-pkg/depcache.cc: - when checking for new important deps, skip critical ones (closes: #485943) + * improve apt progress reporting, display trigger actions + -- Christian Perrier Sat, 14 Jun 2008 07:39:06 +0200 diff --git a/po/apt-all.pot b/po/apt-all.pot index 6319e740..81a84a92 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:50+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1597,7 +1597,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1609,7 +1609,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -2001,70 +2001,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "" @@ -2574,68 +2574,79 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, c-format +msgid "Installing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/ar.po b/po/ar.po index 7b2582ac..3197aad3 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: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -1619,7 +1619,7 @@ msgstr "انتهى وقت الاتصال" msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "خطأ في القراءة" @@ -1631,7 +1631,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "خطأ في الكتابة" @@ -2023,70 +2023,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" @@ -2601,68 +2601,79 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "تحضير %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "فتح %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "التحضير لتهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "تهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "خطأ في معالجة الدليل %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "التحضير لإزالة %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "إزالة %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "تم إزالة %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "التحضير لإزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "تمت إزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "تم تثبيت %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/bg.po b/po/bg.po index e0800134..645b9cfb 100644 --- a/po/bg.po +++ b/po/bg.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-04 17:19+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -1813,7 +1813,7 @@ msgstr "Допустимото време за свързването изтеч msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Грешка при четене" @@ -1825,7 +1825,7 @@ msgstr "Отговорът препълни буфера." msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Грешка при запис" @@ -2229,73 +2229,73 @@ msgstr "Неуспех при преминаването в %s" msgid "Failed to stat the cdrom" msgstr "Неуспех при намирането на атрибутите на cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е само за четене" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Неуспех при отварянето на файл за заключване %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е монтиран по NFS" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Неуспех при достъпа до заключване %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Подпроцесът %s върна код за грешка (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Неуспех при отварянето на файла %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "грешка при четене, все още има %lu за четене, но няма нито един останал" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "грешка при запис, все още име %lu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Проблем при затварянето на файла" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Проблем при премахването на връзка към файла" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" @@ -2839,68 +2839,79 @@ msgstr "Записани са %i записа с %i несъответстващ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Директорията „%s“ липсва" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Подготвяне на %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Разпакетиране на %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Подготвяне на %s за конфигуриране" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Конфигуриране на %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Обработка на тригерите на %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s е инсталиран" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Подготвяне за премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s е премахнат" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка за пълно премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s е напълно премахнат" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s е инсталиран" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е " diff --git a/po/bs.po b/po/bs.po index 8e86696d..05c655c2 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: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -1617,7 +1617,7 @@ msgstr "" msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Greška pri čitanju" @@ -1630,7 +1630,7 @@ msgstr "" msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Greška pri pisanju" @@ -2023,70 +2023,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "" @@ -2601,68 +2601,79 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, fuzzy, c-format msgid "Preparing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se sa %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, fuzzy, c-format msgid "Installed %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, fuzzy, c-format msgid "Removing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, fuzzy, c-format msgid "Removed %s" msgstr "Preporučuje" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Instalirano:" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index 3843dc05..ff14f67e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2006-02-05 22:00+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -1805,7 +1805,7 @@ msgstr "Temps de connexió finalitzat" msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1817,7 +1817,7 @@ msgstr "Una resposta ha desbordat la memòria temporal." msgid "Protocol corruption" msgstr "Protocol corrumput" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Error d'escriptura" @@ -2218,71 +2218,71 @@ msgstr "No es pot canviar a %s" msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "No es pot resoldre el fixter de blocat %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-procés %s ha retornat un codi d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-procés %s ha eixit inesperadament" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "llegits, falten %lu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrits, falten %lu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Ha hagut un problema en tancar el fitxer" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Ha hagut un problema en desenllaçar el fitxer" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -2827,68 +2827,79 @@ msgstr "" "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " "coincidents\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Falta el directori de llistes %spartial." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "S'està preparant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "S'està preparant per a configurar el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "S'està configurant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "S'ha produït un error en processar el directori %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "S'ha instal·lat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "S'està preparant per a l'eliminació del paquet %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "S'està eliminant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "S'ha eliminat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "S'està preparant per a eliminar completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "S'ha eliminat completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "S'ha instal·lat el paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/cs.po b/po/cs.po index 2a82e7f0..cfc14f1f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-05 21:29+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -1779,7 +1779,7 @@ msgstr "Čas spojení vypršel" msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba čtení" @@ -1791,7 +1791,7 @@ msgstr "Odpověď přeplnila buffer." msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba zápisu" @@ -2187,70 +2187,70 @@ msgstr "Nemohu přejít do %s" msgid "Failed to stat the cdrom" msgstr "Nezdařilo se vyhodnotit cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Nešlo otevřít zámkový soubor %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Nemohu získat zámek %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Nemohu otevřít soubor %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále mám %lu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problém při zavírání souboru" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problém při odstraňování souboru" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@ -2780,68 +2780,79 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Adresář '%s' chybí" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Připravuji %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Rozbaluji %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Připravuji nastavení %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Nastavuji %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Zpracovávám spouštěče pro %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Nainstalován %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Připravuji odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Odstraňuji %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Připravuji úplné odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Nainstalován %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n" diff --git a/po/cy.po b/po/cy.po index ef0b4bf1..ba949eb7 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -1856,7 +1856,7 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Gwall darllen" @@ -1868,7 +1868,7 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Gwall ysgrifennu" @@ -2274,72 +2274,72 @@ msgstr "Ni ellir newid i %s" msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" # FIXME -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2888,68 +2888,79 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Wedi Sefydlu: " + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/da.po b/po/da.po index 0669b1da..2e87785b 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2007-09-06 21:40+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish\n" @@ -1796,7 +1796,7 @@ msgstr "Tidsudl msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lsefejl" @@ -1808,7 +1808,7 @@ msgstr "Mellemlageret blev overfyldt af et svar." msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefejl" @@ -2205,70 +2205,70 @@ msgstr "Kunne ikke skifte til %s" msgid "Failed to stat the cdrom" msgstr "Kunne ikke finde cdrommen" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benytter ikke lsning for skrivebeskyttet lsefil %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke bne lsefilen %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benytter ikke lsning for nfs-monteret lsefil %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Kunne ikke opn lsen %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede p %s, men den var der ikke" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke bne filen %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "ls, mangler stadig at lse %lu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skriv, mangler stadig at skrive %lu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem under lukning af fil" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Fejl ved frigivelse af filen" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -2802,68 +2802,79 @@ msgstr "Skrev %i poster med %i ikke-trufne filer\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Listemappen %spartial mangler." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Klargr %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Pakker %s ud" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Gr klar til at stte %s op" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Stter %s op" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Fejl under behandling af mappen %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Installerede %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Gr klar til afinstallation af %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Fjernede %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Gr klar til at fjerne %s helt" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Fjernede %s helt" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Installerede %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/de.po b/po/de.po index 853c07f8..ec97edb0 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:50+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-07-12 14:05+0100\n" "Last-Translator: Holger Wansing \n" "Language-Team: \n" @@ -1830,7 +1830,7 @@ msgstr "Zeitüberschreitung der Verbindung" msgid "Server closed the connection" msgstr "Der Server hat die Verbindung geschlossen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefehler" @@ -1842,7 +1842,7 @@ msgstr "Eine Antwort hat den Puffer zum Überlaufen gebracht." msgid "Protocol corruption" msgstr "Protokoll beschädigt" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Schreibfehler" @@ -2247,70 +2247,70 @@ msgstr "Kann nicht nach %s wechseln" msgid "Failed to stat the cdrom" msgstr "Konnte kein »stat« auf der CD-ROM durchführen" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benutze keine Sperre für schreibgeschützte Lockdatei %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Konnte Lockdatei %s nicht öffnen" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benutze keine Sperre für NFS-eingebundene Lockdatei %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Konnte Lock %s nicht bekommen" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Auf %s gewartet, aber es war nicht da" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozess %s ist mit einem Fehlercode zurückgekehrt (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s hat sich unerwartet beendet" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Konnte Datei %s nicht öffnen" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "Lese, habe noch %lu zu lesen, aber nichts mehr übrig" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "Schreiben, habe noch %lu zu schreiben, konnte aber nicht" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Beim Schließen der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Beim Unlinking der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Beim Synchronisieren einer Datei trat ein Problem auf" @@ -2859,68 +2859,79 @@ msgstr "" "Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien " "geschrieben.\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Verzeichnis »%s« fehlt" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "%s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "%s wird entpackt" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Konfiguration von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Konfiguriere %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Verarbeite Auslöser (Trigger) für %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s installiert" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Entfernen von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "%s wird entfernt" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s entfernt" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Komplettes Entfernen von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s vollständig entfernt" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s installiert" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Kann Protokoll nicht schreiben, openpty() schlug fehl (/dev/pts nicht " diff --git a/po/dz.po b/po/dz.po index 35563388..833a18f9 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: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -1804,7 +1804,7 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས" msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" @@ -1816,7 +1816,7 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" @@ -2214,71 +2214,71 @@ msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚ msgid "Failed to stat the cdrom" msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" @@ -2814,68 +2814,79 @@ msgstr "" "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམཐུན་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་" "ཡོདཔ་ཨིན།\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/el.po b/po/el.po index c89bfbe4..2ee8a23e 100644 --- a/po/el.po +++ b/po/el.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2006-01-18 15:16+0200\n" "Last-Translator: Konstantinos Margaritis \n" "Language-Team: Greek \n" @@ -1823,7 +1823,7 @@ msgstr "Λήξη χρόνου σύνδεσης" msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" @@ -1835,7 +1835,7 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Σφάλμα εγγραφής" @@ -2234,73 +2234,73 @@ msgstr "Αδύνατη η αλλαγή σε %s" msgid "Failed to stat the cdrom" msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " "%s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Αδύνατο το κλείδωμα %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@ -2842,68 +2842,79 @@ msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Ο φάκελος λιστών %spartial αγνοείται." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Προετοιμασία του %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Ξεπακετάρισμα του %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Ρύθμιση του %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Σφάλμα επεξεργασίας του καταλόγου %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Εγκατέστησα το %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Προετοιμασία για την αφαίρεση του %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Αφαιρώ το %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Αφαίρεσα το %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Αποτυχία διαγραφής του %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Εγκατέστησα το %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index a40000db..5f4ff398 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2006-10-12 11:07+0100\n" "Last-Translator: Neil Williams \n" "Language-Team: en_GB \n" @@ -1782,7 +1782,7 @@ msgstr "Connection timeout" msgid "Server closed the connection" msgstr "Server closed the connection" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Read error" @@ -1794,7 +1794,7 @@ msgstr "A response overflowed the buffer." msgid "Protocol corruption" msgstr "Protocol corruption" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Write error" @@ -2189,70 +2189,70 @@ msgstr "Unable to change to %s" msgid "Failed to stat the cdrom" msgstr "Failed to stat the cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Not using locking for read only lock file %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Could not open lock file %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Not using locking for nfs mounted lock file %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Could not get lock %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-process %s returned an error code (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-process %s exited unexpectedly" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Could not open file %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, still have %lu to read but none left" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, still have %lu to write but couldn't" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem closing the file" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problem unlinking the file" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem syncing the file" @@ -2784,68 +2784,79 @@ msgstr "Wrote %i records with %i mismatched files\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Wrote %i records with %i missing files and %i mismatched files\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Lists directory %spartial is missing." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Preparing %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Unpacking %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Preparing to configure %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Configuring %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Error processing directory %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Installed %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Preparing for removal of %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Removing %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Removed %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparing to completely remove %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Completely removed %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Installed %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/es.po b/po/es.po index db715c78..2fd78d3c 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2007-06-21 13:06+0200\n" "Last-Translator: Javier Fernandez-Sanguino \n" "Language-Team: Debian Spanish \n" @@ -1816,7 +1816,7 @@ msgstr "La conexi msgid "Server closed the connection" msgstr "El servidor cerr la conexin" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1828,7 +1828,7 @@ msgstr "Una respuesta desbord msgid "Protocol corruption" msgstr "Corrupcin del protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Error de escritura" @@ -2229,70 +2229,70 @@ msgstr "No se pudo cambiar a %s" msgid "Failed to stat the cdrom" msgstr "No pude montar el cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No se utiliza bloqueos para el fichero de bloqueo de slo lectura %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "No se pudo abrir el fichero de bloqueo '%s'" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "No se pudo bloquear %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba all" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subproceso %s recibi un fallo de segmentacin." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subproceso %s devolvi un cdigo de error (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s termin de forma inesperada" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "ledos, todava deba leer %lu pero no queda nada" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritos, todava tena que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problemas cerrando el archivo" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Hay problemas desligando el fichero %s" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Hay problemas sincronizando el fichero" @@ -2840,68 +2840,79 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Falta el directorio de listas %spartial." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Preparndose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Error procesando el directorio %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Preparndose para eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s eliminado" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparndose para eliminar completamente %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Se borr completamente %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s instalado" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/eu.po b/po/eu.po index 63c449f8..ff7e6781 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-04 23:24+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -1794,7 +1794,7 @@ msgstr "Konexioa denboraz kanpo" msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Irakurketa errorea" @@ -1806,7 +1806,7 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Idazketa errorea" @@ -2203,73 +2203,73 @@ msgstr "Ezin da %s(e)ra aldatu" msgid "Failed to stat the cdrom" msgstr "Huts egin du CDROMa atzitzean" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo " "fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Ezin izan da %s blokeo fitxategia ireki" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Ezin izan da %s blokeoa hartu" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@ -2801,68 +2801,79 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "'%s' direktorioa falta da" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "%s prestatzen" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "%s irekitzen" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "%s konfiguratzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "%s konfiguratzen" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "%s-ren abiarazleak prozesatzen" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s Instalatuta" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "%s kentzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "%s kentzen" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s kendurik" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "%s guztiz ezabatzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s Instalatuta" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago " diff --git a/po/fi.po b/po/fi.po index 4b8dfd0c..8842aea7 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: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-04 19:30+0300\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -1793,7 +1793,7 @@ msgstr "Yhteys aikakatkaistiin" msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lukuvirhe" @@ -1805,7 +1805,7 @@ msgstr "Vastaus aiheutti puskurin ylivuodon." msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Virhe kirjoitettaessa" @@ -2202,70 +2202,70 @@ msgstr "Kansioon %s vaihto ei onnistu" msgid "Failed to stat the cdrom" msgstr "Komento stat ei toiminut rompulle" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Lukkotiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Lukkoa %s ei saada" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Aliprosessi %s palautti virhekoodin (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@ -2798,68 +2798,79 @@ msgstr "" "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta " "tiedostoa\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Kansio \"%s\" puuttuu." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Valmistellaan %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Puretaan %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Valmistaudutaan tekemään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Tehdään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Käsitellään %s:n liipaisimia" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s asennettu" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Valmistaudutaan poistamaan %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Poistetaan %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s poistettu" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Valmistaudutaan poistamaan %s kokonaan" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s poistettiin kokonaan" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s asennettu" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts " diff --git a/po/fr.po b/po/fr.po index 4e5261f3..d4b19b3d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-04 10:15+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -242,11 +242,13 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" +msgstr "" +"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" +msgstr "" +"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." @@ -322,7 +324,8 @@ msgstr "Impossible d'écrire sur %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" +msgstr "" +"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" @@ -437,7 +440,8 @@ msgstr "Aucune sélection ne correspond" #: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" +msgstr "" +"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" #: ftparchive/cachedb.cc:43 #, c-format @@ -816,7 +820,8 @@ msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés #: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée." +msgstr "" +"Les paquets doivent être enlevés mais la désinstallation est désactivée." #: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" @@ -850,7 +855,8 @@ msgstr "Il est nécessaire de prendre %so dans les archives.\n" #: cmdline/apt-get.cc:847 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n" +msgstr "" +"Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n" #: cmdline/apt-get.cc:850 #, c-format @@ -921,7 +927,8 @@ msgstr "" #: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus." +msgstr "" +"l'option --fix-missing et l'échange de support ne sont pas encore reconnus." #: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." @@ -983,7 +990,8 @@ msgstr "Aucun paquet ne correspond au paquet %s" #: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" +msgstr "" +"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" #: cmdline/apt-get.cc:1164 #, c-format @@ -1046,7 +1054,8 @@ msgstr "L'information suivante devrait vous aider à résoudre la situation : " #: cmdline/apt-get.cc:1449 msgid "Internal Error, AutoRemover broke stuff" -msgstr "Erreur interne, l'outil de suppression automatique a cassé quelque chose." +msgstr "" +"Erreur interne, l'outil de suppression automatique a cassé quelque chose." #: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" @@ -1250,7 +1259,8 @@ msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" #: cmdline/apt-get.cc:2540 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." +msgstr "" +"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." #: cmdline/apt-get.cc:2544 msgid "Failed to process build dependencies" @@ -1441,7 +1451,8 @@ msgstr "" "seules les erreurs" #: dselect/install:104 -msgid "above this message are important. Please fix them and run [I]nstall again" +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" "précédant ce message sont importantes. Veuillez les corriger et\n" "démarrer l'[I]nstallation une nouvelle fois." @@ -1804,7 +1815,8 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" +msgstr "" +"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" #: methods/ftp.cc:291 #, c-format @@ -1819,7 +1831,7 @@ msgstr "Dépassement du délai de connexion" msgid "Server closed the connection" msgstr "Le serveur a fermé la connexion" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Erreur de lecture" @@ -1831,7 +1843,7 @@ msgstr "Une réponse a fait déborder le tampon." msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Erreur d'écriture" @@ -1841,7 +1853,8 @@ msgstr "Impossible de créer un connecteur" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Impossible de se connecter sur le port de données, délai de connexion dépassé" +msgstr "" +"Impossible de se connecter sur le port de données, délai de connexion dépassé" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1978,10 +1991,12 @@ msgstr "Impossible d'accéder au porte-clés : « %s »" #: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." +msgstr "" +"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." #: methods/gpgv.cc:205 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de déterminer " "l'empreinte de la clé." @@ -2232,70 +2247,70 @@ msgstr "Impossible d'accéder à %s" msgid "Failed to stat the cdrom" msgstr "Impossible d'accéder au cédérom." -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Verrou non utilisé pour le fichier %s en lecture seule" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Impossible d'ouvrir le fichier verrou %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Impossible de verrouiller %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "A attendu %s mais il n'était pas présent" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Le sous-processus %s a commis une violation d'accès mémoire" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Le sous-processus %s s'est arrêté prématurément" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Impossible de verrouiller %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "lu(s), %lu restant à lire, mais rien n'est disponible" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problème de fermeture du fichier" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problème d'effacement du fichier" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" @@ -2426,12 +2441,14 @@ msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" #: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" +msgstr "" +"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" #: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" +msgstr "" +"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" #: apt-pkg/sourcelist.cc:199 #, c-format @@ -2456,7 +2473,8 @@ msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" +msgstr "" +"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" #: apt-pkg/packagemanager.cc:428 #, c-format @@ -2477,7 +2495,8 @@ msgstr "Le type de fichier d'index « %s » n'est pas accepté" #: apt-pkg/algorithms.cc:247 #, c-format -msgid "The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son " "archive." @@ -2559,7 +2578,8 @@ msgstr "Impossible de localiser %s." #: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Vous devez insérer quelques adresses « sources » dans votre sources.list" +msgstr "" +"Vous devez insérer quelques adresses « sources » dans votre sources.list" #: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." @@ -2687,7 +2707,8 @@ msgstr "Assemblage des fichiers listés dans les champs Provides" #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" -msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "" +"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" #: apt-pkg/acquire-item.cc:127 #, c-format @@ -2704,7 +2725,8 @@ msgstr "Somme de contrôle de hachage incohérente" #: apt-pkg/acquire-item.cc:1100 msgid "There is no public key available for the following key IDs:\n" -msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" +msgstr "" +"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" #: apt-pkg/acquire-item.cc:1213 #, c-format @@ -2727,7 +2749,8 @@ msgstr "" #: apt-pkg/acquire-item.cc:1313 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." @@ -2846,68 +2869,79 @@ msgstr "" "%i enregistrements écrits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Répertoire %s inexistant" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Préparation de %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Décompression de %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Préparation de la configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Traitement des déclencheurs (« triggers ») pour %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s installé" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Préparation de la suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s supprimé" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Préparation de la suppression complète de %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s complètement supprimé" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s installé" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Impossible d'écrire le journal, échec d'openpty()\n" @@ -2920,4 +2954,3 @@ msgstr "Impossible de corriger le fichier" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" - diff --git a/po/gl.po b/po/gl.po index ffb20cc9..3ecf0c35 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-06 19:24+0100\n" "Last-Translator: Jacobo Tarrío \n" "Language-Team: Galician \n" @@ -1805,7 +1805,7 @@ msgstr "Tempo esgotado para a conexión" msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de lectura" @@ -1817,7 +1817,7 @@ msgstr "Unha resposta desbordou o buffer." msgid "Protocol corruption" msgstr "Corrupción do protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escritura" @@ -2218,70 +2218,70 @@ msgstr "Non se pode cambiar a %s" msgid "Failed to stat the cdrom" msgstr "Non se puido analizar o CD-ROM" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Non se puido abrir o ficheiro de bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Non se puido obter o bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O subproceso %s devolveu un código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Non se puido abrir o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problema ao pechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problema ao borrar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problema ao sincronizar o ficheiro" @@ -2818,68 +2818,79 @@ msgstr "" "Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non " "coinciden\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "O directorio \"%s\" falla" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "A desempaquetar %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "A se preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "A procesar os disparadores de %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Instalouse %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "A se preparar para a eliminación de %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "A eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Eliminouse %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "A se preparar para eliminar %s completamente" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Eliminouse %s completamente" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Instalouse %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Non se puido escribir no rexistro, a chamada a openpty() fallou (¿/dev/pts " diff --git a/po/he.po b/po/he.po index b0e55135..1b31532f 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@ -1606,7 +1606,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1618,7 +1618,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -2011,70 +2011,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "" @@ -2584,68 +2584,79 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "שגיאה בעיבוד ספריה %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, fuzzy, c-format msgid "Installed %s" msgstr "מותקן:" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "מותקן:" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index f622445d..df8fd73e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-11 14:49+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" @@ -1790,7 +1790,7 @@ msgstr "Időtúllépés a kapcsolatban" msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Olvasási hiba" @@ -1802,7 +1802,7 @@ msgstr "A válasz túlcsordította a puffert." msgid "Protocol corruption" msgstr "Protokoll hiba" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Írási hiba" @@ -2197,70 +2197,70 @@ msgstr "Nem sikerült ide váltani: %s" msgid "Failed to stat the cdrom" msgstr "Nem sikerült elérni a CD-ROM-ot." -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nem zárolom '%s' csak olvasható zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "%s zárolási fájl nem nyitható meg" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nem zárolom '%s' NFS-csatlakoztatású zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Nem sikerült zárolni: %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s nem volt itt, ahogy vártam" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s alfolyamat hibakóddal tért vissza (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni %s fájlt" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "olvasás, még kellene %lu, de már az összes elfogyott" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "írás, még kiírandó %lu de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Hiba a fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Hiba a fájl leválasztásával" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" @@ -2797,68 +2797,79 @@ msgstr "%i rekord kiírva %i hibásan párosított fájllal\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Hiányzik ez a könyvtár: %s" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "%s előkészítése" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "%s kicsomagolása" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "%s konfigurálásának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "%s konfigurálása" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Indítók feldolgozása ehhez: %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Telepített %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "%s eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "%s eltávolítása" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Eltávolított %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "%s teljes eltávolítása előkészítése" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Telepített %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Naplózási hiba, sikertelen openpty() (a /dev/pts nincs csatolva?)\n" diff --git a/po/it.po b/po/it.po index 162af852..be3d9d4a 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:50+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-04 12:26+0200\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@ -1811,7 +1811,7 @@ msgstr "Timeout della connessione" msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Errore di lettura" @@ -1823,7 +1823,7 @@ msgstr "Una risposta ha superato le dimensioni del buffer." msgid "Protocol corruption" msgstr "Corruzione nel protocollo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Errore di scrittura" @@ -2228,70 +2228,70 @@ msgstr "Impossibile raggiungere %s" msgid "Failed to stat the cdrom" msgstr "Impossibile accedere al cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Locking disabilitato per il file di lock in sola lettura %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Impossibile aprire il file di lock %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lock disabilitato per il file di lock %s nfs montato" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Impossibile ottenere il lock %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa per %s ma non presente" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Il sottoprocesso %s ha ritornato un codice d'errore (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Il sottoprocesso %s uscito inaspettatamente" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Impossibile aprire il file %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "letto, c'erano ancora %lu da leggere ma non e' stato lasciato nulla" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scrittura, c'erano ancora %lu da scrivere ma non era possibile" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Si verificato un problema chiudendo il file" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Si verificato un problema rimuovendo il file" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Si verificato un problema sincronizzando il file" @@ -2837,68 +2837,79 @@ msgstr "Scritti %i record con %i file senza match\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Scritti %i record con %i file mancanti e %i file senza match\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Manca la directory '%s'" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Preparazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Scompattamento di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Preparazione alla configurazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Configurazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Elaborazione opzioni addizionali per %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s Installato" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Preparazione per la rimozione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Rimozione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s rimosso" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparazione alla rimozione totale di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Rimozione totale completata %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s Installato" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Impossibile scrivere un log, openpty() fallito (/dev/pts montato?)\n" diff --git a/po/ja.po b/po/ja.po index 548fbcd5..dec9b9ce 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-06 11:11+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -1804,7 +1804,7 @@ msgstr "接続タイムアウト" msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "読み込みエラー" @@ -1816,7 +1816,7 @@ msgstr "レスポンスがバッファをオーバフローさせました。" msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "書き込みエラー" @@ -2211,70 +2211,70 @@ msgstr "%s へ変更することができません" msgid "Failed to stat the cdrom" msgstr "cdrom の状態を取得するのに失敗しました" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "読み込み専用のロックファイル %s にロックは使用しません" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "ロックファイル %s をオープンできません" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "ロック %s が取得できませんでした" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子プロセス %s がエラーコード (%u) を返しました" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "読み込みが %lu 残っているはずですが、何も残っていません" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "ファイルのクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "ファイルの削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" @@ -2815,68 +2815,79 @@ msgstr "" "%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない" "ファイルがあります。\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "ディレクトリ '%s' が見つかりません" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "%s を準備しています" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "%s を展開しています" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "%s の設定を準備しています" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "%s を設定しています" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "%s のトリガーを処理しています" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s をインストールしました" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "%s の削除を準備しています" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "%s を削除しています" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s を削除しました" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "%s を完全に削除する準備をしています" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s を完全に削除しました" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s をインストールしました" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな" diff --git a/po/km.po b/po/km.po index 6666a031..3269183a 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: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -1780,7 +1780,7 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​" msgid "Server closed the connection" msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "ការអាន​មានកំហុស" @@ -1792,7 +1792,7 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "ការសរសេរ​មានកំហុស" @@ -2184,70 +2184,70 @@ msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ" msgid "Failed to stat the cdrom" msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ " -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" @@ -2774,68 +2774,79 @@ msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាម msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "កំពុងរៀបចំ​ %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "កំពុង​ស្រាយ %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "​កំហុស​ដំណើរការ​ថត​ %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "បាន​ដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "កំពុង​យក %s ចេញ" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "បាន​យក %s ចេញ" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "បាន​ដំឡើង %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/ko.po b/po/ko.po index 4a420304..42072cbe 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-04 13:52-0400\n" "Last-Translator: Sunjae Park \n" "Language-Team: Korean \n" @@ -1790,7 +1790,7 @@ msgstr "연결 시간 초과" msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "읽기 오류" @@ -1802,7 +1802,7 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다." msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "쓰기 오류" @@ -2194,70 +2194,70 @@ msgstr "%s 디렉토리로 이동할 수 없습니다" msgid "Failed to stat the cdrom" msgstr "CD-ROM의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "잠금 파일 %s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "%s 잠금 파일을 얻을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "파일을 닫는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "파일을 지우는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "파일을 동기화하는 데 문제가 있습니다" @@ -2785,68 +2785,79 @@ msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "디렉토리 '%s' 없습니다." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "%s 준비 중" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "%s을(를) 푸는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "%s을(를) 설정할 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "%s 설정 중" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "%s의 트리거를 처리하는 중" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s 설치했음" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "%s을(를) 삭제할 준비 중" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "%s 지우는 중" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s 지움" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "%s을(를) 완전히 지울 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s을(를) 완전히 지웠습니다" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s 설치했음" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n" diff --git a/po/ku.po b/po/ku.po index 3dbef389..dcd0f6a8 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: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -1619,7 +1619,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Çewiya xwendinê" @@ -1631,7 +1631,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Çewtiya nivîsînê" @@ -2026,70 +2026,70 @@ msgstr "Nikarî derbasa %s bike" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Nikarî qufila pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "" @@ -2601,68 +2601,79 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Peldanka '%s' kêm e" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "%s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "%s tê derxistin" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Mîhengkirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "%s tê mîhengkirin" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Di şixulandina pêrista %s de çewtî" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s hatine sazkirin" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "%s tê rakirin" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Bi tevahî rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s bi tevahî hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s hatine sazkirin" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/mr.po b/po/mr.po index 562fad6c..f636f283 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2006-08-09 16:17+0200\n" "Last-Translator: Priti Patil \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -1784,7 +1784,7 @@ msgstr "वेळेअभावी संबंध जोडता येत msgid "Server closed the connection" msgstr "सर्व्हरने संबंध जोडणी बंद केली" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "त्रुटी वाचा" @@ -1796,7 +1796,7 @@ msgstr "प्रतिसाधाने बफर भरुन गेले." msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "लिहिण्यात त्रुटी" @@ -2190,70 +2190,70 @@ msgstr "%s मध्ये बदलण्यास असमर्थ" msgid "Failed to stat the cdrom" msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "%s कुलूप फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "%s कुलुप मिळवता येत नाही" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s साठी थांबलो पण ते तेथे नव्हते" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" @@ -2793,68 +2793,79 @@ msgstr "%i विजोड संचिकांबरोबर %i माहि msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "संचयिका यादीत %s पार्शल हरवले आहे." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "%s तयार करित आहे" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "%s सुटे/मोकळे करीत आहे " -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "%s संरचने साठी तयार करत आहे" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "%s संरचित होत आहे" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s " -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s संस्थापित झाले" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "%s काढून टाकत आहे" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s संपूर्ण काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s संस्थापित झाले" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/nb.po b/po/nb.po index 2b7552d5..10e67c85 100644 --- a/po/nb.po +++ b/po/nb.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-01-02 14:40+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmal \n" @@ -1805,7 +1805,7 @@ msgstr "Tidsavbrudd p msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1817,7 +1817,7 @@ msgstr "Et svar oversv msgid "Protocol corruption" msgstr "Protokolldeleggelse" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -2212,70 +2212,70 @@ msgstr "Klarer ikke msgid "Failed to stat the cdrom" msgstr "Klarer ikke f statusen p CD-spilleren" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Bruker ikke lsing for den skrivebeskyttede lsefila %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke pne lsefila %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Bruker ikke lsing p den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Fr ikke lst %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet p %s, men den ble ikke funnet" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s ga en feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke pne fila %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har fremdeles %lu igjen lese, men ingen igjen" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen skrive, men klarte ikke " -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenke til fila" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@ -2806,68 +2806,79 @@ msgstr "Skrev %i poster med %i feile filer.\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Mappa %s mangler" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Forbereder %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Pakker ut %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Forbereder oppsett av %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Setter opp %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Behandler utlsere for %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Installerte %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Forbereder fjerning av %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Fjernet %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Forbereder fullstendig slette %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Fjernet %s fullstendig" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Installerte %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n" diff --git a/po/ne.po b/po/ne.po index aabbed96..3bce00b0 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: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -1783,7 +1783,7 @@ msgstr "जडान समय सकियो" msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" @@ -1795,7 +1795,7 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" @@ -2187,70 +2187,70 @@ msgstr "%s मा परिवर्तन गर्न असक्षम" msgid "Failed to stat the cdrom" msgstr "सिडी रोम स्थिर गर्न असफल भयो" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "ताल्चा प्राप्त गर्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" @@ -2779,68 +2779,79 @@ msgstr "मेल नखाएका फाइल %i हरू संगै %i msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr " %s तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr " %s अनप्याक गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr " %s कनफिगर गर्न तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr " %s कनफिगर गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr " %s हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr " %s हटाइदैछ" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr " %s हट्यो" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr " %s पूर्ण रुपले हट्यो" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " %s स्थापना भयो" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/nl.po b/po/nl.po index 33f5eb8e..78c748d7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-05 18:39+0200\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@ -1819,7 +1819,7 @@ msgstr "Verbinding is verlopen" msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Leesfout" @@ -1831,7 +1831,7 @@ msgstr "Een reactie deed de buffer overlopen" msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Schrijffout" @@ -2238,73 +2238,73 @@ msgstr "Kan %s niet veranderen" msgid "Failed to stat the cdrom" msgstr "Het opvragen van de CD-status is mislukt" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" "vergrendelingsbestand %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Kon het vergrendelingsbestand '%s' niet openen" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Kon vergrendeling %s niet verkrijgen" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Probleem bij het afsluiten van het bestand" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Probleem bij het ontlinken van het bestand" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -2849,68 +2849,79 @@ msgstr "" "%i records weggeschreven met %i missende bestanden en %i niet overeenkomende " "bestanden\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Map '%s' is afwezig." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "%s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "%s wordt uitgepakt" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Configuratie van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "%s wordt geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Fout bij het verwerken van triggers voor %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s is geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "%s wordt verwijderd" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s is verwijderd" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Volledige verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s is volledig verwijderd" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s is geïnstalleerd" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet " diff --git a/po/nn.po b/po/nn.po index 1c0759ad..ea47beda 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: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -1795,7 +1795,7 @@ msgstr "Tidsavbrot p msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1807,7 +1807,7 @@ msgstr "Eit svar flaumde over bufferen." msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -2200,70 +2200,70 @@ msgstr "Klarte ikkje byta til %s" msgid "Failed to stat the cdrom" msgstr "Klarte ikkje f status til CD-ROM" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikkje opna lsefila %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Klarte ikkje lsa %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s returnerte ein feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har framleis %lu att lesa, men ingen att" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@ -2798,68 +2798,79 @@ msgstr "Skreiv %i postar med %i filer som ikkje passa\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, fuzzy, c-format msgid "Preparing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, fuzzy, c-format msgid "Configuring %s" msgstr "Koplar til %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Feil ved lesing av katalogen %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, fuzzy, c-format msgid "Installed %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, fuzzy, c-format msgid "Removing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, fuzzy, c-format msgid "Removed %s" msgstr "Tilrdingar" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Installert: " + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 941bf138..b29f0e51 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:50+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-06 10:29+0100\n" "Last-Translator: Wiktor Wandachowicz \n" "Language-Team: Polish \n" @@ -1811,7 +1811,7 @@ msgstr "Przekroczenie czasu połączenia" msgid "Server closed the connection" msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Błąd odczytu" @@ -1823,7 +1823,7 @@ msgstr "Odpowiedź przepełniła bufor." msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Błąd zapisu" @@ -2222,70 +2222,70 @@ msgstr "Nie udało się przejść do %s" msgid "Failed to stat the cdrom" msgstr "Nie udało się wykonać operacji stat na CDROM-ie" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Nie udało się otworzyć pliku blokady %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Nie udało się uzyskać blokady %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie było go" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s spowodował naruszenie segmentacji." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s zwrócił kod błędu (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakończył się niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Nie udało się otworzyć pliku %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "należało zapisać jeszcze %lu, ale nie udało się to" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem przy zamykaniu pliku" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problem przy usuwaniu pliku" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -2818,68 +2818,79 @@ msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Brakuje katalogu \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Przygotowanie %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Rozpakowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Przygotowanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Konfigurowanie %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Przetwarzanie wyzwalaczy dla %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Zainstalowany %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Przygotowanie do usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Usuwanie %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Usunięto %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Przygotowanie do całkowitego usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Całkowicie usunięto %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Zainstalowany %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie " diff --git a/po/pt.po b/po/pt.po index 40eefa9a..f0934ff8 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-06 23:13+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -1806,7 +1806,7 @@ msgstr "Foi atingido o tempo limite de ligação" msgid "Server closed the connection" msgstr "O servidor fechou a ligação" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1818,7 +1818,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escrita" @@ -2218,73 +2218,73 @@ msgstr "Impossível mudar para %s" msgid "Failed to stat the cdrom" msgstr "Impossível executar stat ao cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir ficheiro de lock %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via " "nfs" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter acesso exclusivo a %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou por %s mas não estava lá" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O sub-processo %s terminou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "lido, ainda restam %lu para serem lidos mas não resta nenhum" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrito, ainda restam %lu para escrever mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problema ao fechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problema ao remover o link ao ficheiro" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@ -2833,68 +2833,79 @@ msgstr "" "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Falta o directório '%s'" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "A desempacotar %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "A preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "A processar chamadas para %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "A preparar a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "A remover %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "A preparar para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Remoção completa de %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s instalado" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está " diff --git a/po/pt_BR.po b/po/pt_BR.po index fe6b7327..60996032 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: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-10 18:31-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: l10n portuguese \n" @@ -1808,7 +1808,7 @@ msgstr "Conexão expirou" msgid "Server closed the connection" msgstr "Servidor fechou a conexão" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1820,7 +1820,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escrita" @@ -2221,70 +2221,70 @@ msgstr "Impossível mudar para %s" msgid "Failed to stat the cdrom" msgstr "Impossível executar \"stat\" no cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Não usando travamento para arquivo de trava somente leitura %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir arquivo de trava %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Não usando travamento para arquivo de trava montado via nfs %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter trava %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrita, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problema removendo o arquivo" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" @@ -2829,68 +2829,79 @@ msgstr "" "Gravados %i registros com %i arquivos faltando e %i arquivos que não " "combinam\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Diretório '%s' está faltando" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Desempacotando %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Preparando para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Erro processando gatilhos para %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Preparando para a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Removendo %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparando para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s completamente removido" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s instalado" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n" diff --git a/po/ro.po b/po/ro.po index 607557c0..aa574e66 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:50+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-06-28 13:08+0300\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -1819,7 +1819,7 @@ msgstr "Timpul de conectare a expirat" msgid "Server closed the connection" msgstr "Serverul a închis conexiunea" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Eroare de citire" @@ -1831,7 +1831,7 @@ msgstr "Un răspuns a depășit zona de tampon." msgid "Protocol corruption" msgstr "Protocol corupt" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Eroare de scriere" @@ -2235,70 +2235,70 @@ msgstr "Nu pot schimba la %s" msgid "Failed to stat the cdrom" msgstr "Eșec la „stat” pentru CD" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Nu pot deschide fișierul blocat %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Nu pot determina blocajul %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Așteptat %s, dar n-a fost acolo" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subprocesul %s a întors un cod de eroare (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fișierului" @@ -2843,68 +2843,79 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "S-au scris %i înregistrări cu %i fișiere lipsă și %i fișiere nepotrivite\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Directorul „%s” lipsește." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Se pregătește %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Se despachetează %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Se pregătește configurarea %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Se configurează %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Se procesează declanșatorii pentru %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Instalat %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Se pregătește ștergerea lui %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Se șterge %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Șters %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Se pregătește ștergerea completă a %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Șters complet %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Instalat %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n" diff --git a/po/ru.po b/po/ru.po index e9085431..e5ebc7be 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-06 20:30+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -1828,7 +1828,7 @@ msgstr "Допустимое время ожидания для соединен msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Ошибка чтения" @@ -1840,7 +1840,7 @@ msgstr "Ответ переполнил буфер." msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Ошибка записи" @@ -2243,76 +2243,76 @@ msgstr "Невозможно сменить текущий каталог на % msgid "Failed to stat the cdrom" msgstr "Невозможно получить атрибуты cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s доступен только для " "чтения" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Не удалось открыть файл блокировки %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s находится на файловой " "системе nfs" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Не удалось получить доступ к файлу блокировки %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Порождённый процесс %s вернул код ошибки (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Не удалось открыть файл %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Проблема закрытия файла" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Ошибка при удалении файла" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файловых буферов с диском" @@ -2845,68 +2845,79 @@ msgstr "" "Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими " "файлами\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Каталог %s отсутствует" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Подготавливается %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Распаковывается %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Подготавливается для конфигурации %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Настройка %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Обрабатываются триггеры для %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Установлен %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Подготавливается для удаления %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Удаление %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Удалён %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка к полному удалению %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "%s полностью удалён" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Установлен %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не " diff --git a/po/sk.po b/po/sk.po index d567121c..d86d5dcc 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-05 19:22+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@ -1787,7 +1787,7 @@ msgstr "Uplynul čas spojenia" msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba pri čítaní" @@ -1799,7 +1799,7 @@ msgstr "Odpoveď preplnila zásobník." msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba pri zápise" @@ -2196,70 +2196,70 @@ msgstr "Nedá sa prejsť do %s" msgid "Failed to stat the cdrom" msgstr "Nedá sa vyhodnotiť cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Súbor zámku %s sa nedá otvoriť" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Zamykanie pre súbor zámku %s pripojený cez nfs sa nepoužíva" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Zámok %s sa nedá získať" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržal chybu segmentácie." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočakávane skončil" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Nedá sa otvoriť súbor %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "čítanie, stále treba prečítať %lu, ale už nič neostáva" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále treba zapísať %lu, no nedá sa to" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problém pri zatváraní súboru" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problém pri odstraňovaní súboru" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" @@ -2788,68 +2788,79 @@ msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Adresár '%s' chýba" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Pripravuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Pripravuje sa nastavenie %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Nastavuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Spracovávajú sa spúšťače %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Nainštalovaný balík %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravuje sa odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Odstraňuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Odstránený balík %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravuje sa úplné odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Balík '%s' je úplne odstránený" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Nainštalovaný balík %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je " diff --git a/po/sl.po b/po/sl.po index 8cbcf46a..d620877d 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: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev \n" "Language-Team: Slovenian \n" @@ -1787,7 +1787,7 @@ msgstr "Povezava potekla" msgid "Server closed the connection" msgstr "Strenik je zaprl povezavo" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Napaka pri branju" @@ -1799,7 +1799,7 @@ msgstr "Odgovor je prekora msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Napaka pri pisanju" @@ -2193,70 +2193,70 @@ msgstr "Ni mogo msgid "Failed to stat the cdrom" msgstr "Ni mogoe doloiti CD-ROM-a" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko samo za branje %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Ni mogoe odprti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Ni mogoe dobiti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "akal, a %s ni bil tam" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Napaka pri razlenjenosti podprocesa %s." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s je vrnil kodo napake (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s se je nepriakovano zakljuil" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Ne morem odpreti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "berem, e vedno %lu za branje, a nobeden ostal" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "piem, e vedno %lu za pisanje, a ni mogoe" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Teava pri zapiranju datoteke" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Teava pri odvezovanju datoteke" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Teava pri usklajevanju datoteke" @@ -2793,68 +2793,79 @@ msgstr "" "Zapisal %i zapisov z %i manjkajoimi datotekami in %i neujemajoimi " "datotekami.\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Manjka imenik s seznami %spartial." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, fuzzy, c-format msgid "Preparing %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se z %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Napaka pri obdelavi imenika %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, fuzzy, c-format msgid "Installed %s" msgstr " Nameen: " -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, fuzzy, c-format msgid "Removing %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, fuzzy, c-format msgid "Removed %s" msgstr "Priporoa" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Odstranitev %s ni uspela" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Nameen: " + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 1d4ea265..c07bdfc7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,13 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-07 06:19+0100\n" "Last-Translator: Peter Karlsson \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" #: cmdline/apt-cache.cc:143 #, c-format @@ -1806,7 +1806,7 @@ msgstr "Tidsgränsen för anslutningen överskreds" msgid "Server closed the connection" msgstr "Servern stängde anslutningen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Läsfel" @@ -1818,7 +1818,7 @@ msgstr "Ett svar spillde bufferten." msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivfel" @@ -2222,70 +2222,70 @@ msgstr "Kunde inte byta till %s" msgid "Failed to stat the cdrom" msgstr "Kunde inte ta status på cd-romen." -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Använder inte låsning för skrivskyddade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Kunde inte öppna låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Använder inte låsning för nfs-monterade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Kunde inte erhålla låset %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade på %s men den fanns inte där" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s svarade med en felkod (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s avslutades oväntat" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Kunde inte öppna filen %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem med att stänga filen" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problem med att länka ut filen" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" @@ -2823,68 +2823,79 @@ msgstr "Skrev %i poster med %i filer som inte stämmer\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Katalogen \"%s\" saknas" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Förbereder %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Packar upp %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Förbereder konfigurering av %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Konfigurerar %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Behandlar utlösare för %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Installerade %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Förbereder borttagning av %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Tog bort %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Förbereder borttagning av hela %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Tog bort hela %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Installerade %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n" diff --git a/po/th.po b/po/th.po index 176c0b47..4529d55e 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-06 12:52+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -1765,7 +1765,7 @@ msgstr "หมดเวลารอเชื่อมต่อ" msgid "Server closed the connection" msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "การอ่านข้อมูลผิดพลาด" @@ -1777,7 +1777,7 @@ msgstr "คำตอบท่วมบัฟเฟอร์" msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" @@ -2169,70 +2169,70 @@ msgstr "ไม่สามารถเปลี่ยนไดเรกทอร msgid "Failed to stat the cdrom" msgstr "ไม่สามารถ stat ซีดีรอม" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "ไม่สามารถเปิดแฟ้มล็อค %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "ไม่สามารถล็อค %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "ไม่สามารถเปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "เกิดปัญหาขณะปิดแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "เกิดปัญหาขณะลบแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" @@ -2754,68 +2754,79 @@ msgstr "เขียนแล้ว %i ระเบียน โดยมีแ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "ไม่มีไดเรกทอรี '%s'" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "กำลังเตรียม %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "กำลังแตกแพกเกจ %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "กำลังเตรียมตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "กำลังตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "กำลังประมวลผลการสะกิดสำหรับ %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "ติดตั้ง %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "กำลังเตรียมถอดถอน %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "กำลังถอดถอน %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "ถอดถอน %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "ติดตั้ง %s แล้ว" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts " diff --git a/po/tl.po b/po/tl.po index ae2e4adc..5807548c 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -1808,7 +1808,7 @@ msgstr "Lumipas ang koneksyon" msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Error sa pagbasa" @@ -1820,7 +1820,7 @@ msgstr "May sagot na bumubo sa buffer." msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Error sa pagsulat" @@ -2222,73 +2222,73 @@ msgstr "Di makalipat sa %s" msgid "Failed to stat the cdrom" msgstr "Bigo sa pag-stat ng cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Hindi mabuksan ang talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " "nfs" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Naghudyat ang sub-process %s ng error code (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" @@ -2833,68 +2833,79 @@ msgstr "" "Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang " "mismatch\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Hinahanda ang %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Binubuklat ang %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Hinahanda ang %s upang isaayos" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Isasaayos ang %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Error sa pagproseso ng directory %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Naghahanda para sa pagtanggal ng %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Tinatanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Tinanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Naghahanda upang tanggalin ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Natanggal ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Iniluklok ang %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/uk.po b/po/uk.po index 7fdafc74..07e5342e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2006-07-29 15:57+0300\n" "Last-Translator: Artem Bondarenko \n" "Language-Team: Українська \n" @@ -1821,7 +1821,7 @@ msgstr "Час з'єднання вичерпався" msgid "Server closed the connection" msgstr "Сервер закрив з'єднання" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Помилка читання" @@ -1833,7 +1833,7 @@ msgstr "Відповідь переповнила буфер." msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Помилка запису" @@ -2236,75 +2236,75 @@ msgstr "Неможливо зробити зміни у %s" msgid "Failed to stat the cdrom" msgstr "Не вдалося прочитати атрибути cdrom" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s доступний тільки " "для читання" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Не можливо відкрити lock файл %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s знаходиться на " "файловій системі nfs" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, fuzzy, c-format msgid "Could not get lock %s" msgstr "Не можливо отримати lock %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Очікується на %s але його тут немає" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Підпроцес %s отримав segmentation fault." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Підпроцес %s повернув код помилки (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Підпроцес %s раптово завершився" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Не можливо відкрити файл %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Проблема з закриттям файла" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Проблема з роз'єднанням файла" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" @@ -2841,68 +2841,79 @@ msgstr "Записано %i записів з %i невідповідними ф msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Lists тека %spartial відсутня." -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Підготовка %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Розпакування %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Підготовка до конфігурації %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Конфігурація %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Помилка обробки течи %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Встановлено %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Підготовка до видалення %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Видаляється %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Видалено %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Підготовка до повного видалення %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Повністю видалено %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Встановлено %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" diff --git a/po/vi.po b/po/vi.po index a0d483a8..9f7d153d 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-05-02 17:13+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -1836,7 +1836,7 @@ msgstr "Thời hạn kết nối" msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lỗi đọc" @@ -1848,7 +1848,7 @@ msgstr "Một trả lời đã tràn bộ đệm." msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Lỗi ghi" @@ -2246,70 +2246,70 @@ msgstr "Không thể chuyển đổi sang %s" msgid "Failed to stat the cdrom" msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Không thể lấy khóa %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Đã đợi %s nhưng mà chưa gặp nó" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Tiến trình con %s đã thoát bất ngờ" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Không thể mở tập tin %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ghi, còn cần ghi %lu nhưng mà không thể" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Gặp lỗi khi đóng tập tin đó" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Gặp lỗi khi bỏ liên kết tập tin đó" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó" @@ -2849,68 +2849,79 @@ msgstr "" "Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với " "nhau\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "Thiếu thư mục « %s »" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "Đang chuẩn bị %s..." -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "Đang mở gói %s..." -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "Đang chuẩn bị cấu hình %s..." -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "Đang cấu hình %s..." -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "Đang xử lý các bộ gây nên cho %s" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "Đã cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "Đang chuẩn bị gỡ bỏ %s..." -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "Đang gỡ bỏ %s..." -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "Đã gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..." -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "Mới gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Đã cài đặt %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Không thể ghi lưu, openpty() bị lỗi (« /dev/pts » chưa lắp ?)\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 32235218..ad25b10b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 09:18+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-04-18 21:53+0800\n" "Last-Translator: Deng Xiyue \n" "Language-Team: Debian Chinese [GB] \n" @@ -1770,7 +1770,7 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "读错误" @@ -1782,7 +1782,7 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "写文件出错" @@ -2174,70 +2174,70 @@ msgstr "无法切换工作目录到 %s" msgid "Failed to stat the cdrom" msgstr "无法读取光盘的状态" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读，因而无法使用文件锁%s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出了" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "读文件时出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "写文件时出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "关闭文件时出错" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "用 unlink 删除文件时出错" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "同步文件时出错" @@ -2764,68 +2764,79 @@ msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "目录 %s 不见了" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "启动对 %s 的处理" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "正在删除 %s" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "已安装 %s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 9a0865a8..65ff7771 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: \n" -"POT-Creation-Date: 2008-05-04 09:50+0200\n" +"POT-Creation-Date: 2008-05-28 14:25+0200\n" "PO-Revision-Date: 2008-06-29 21:41+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@ -1770,7 +1770,7 @@ msgstr "連線逾時" msgid "Server closed the connection" msgstr "伺服器關閉聯線。" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "讀取失敗。" @@ -1782,7 +1782,7 @@ msgstr "答覆超過緩衝區長度。" msgid "Protocol corruption" msgstr "協定失敗。" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "寫入失敗。" @@ -2174,70 +2174,70 @@ msgstr "無法進入『%s』目錄。" msgid "Failed to stat the cdrom" msgstr "CD-ROM 狀況讀取失敗" -#: apt-pkg/contrib/fileutl.cc:147 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "不使用檔案鎖定於唯獨檔案 %s" -#: apt-pkg/contrib/fileutl.cc:152 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "無法開啟『%s』鎖定檔。" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "不使用檔案鎖定於 nfs 掛載點上得檔案 %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "無法取得『%s』鎖。" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待 %s 但是它不存在" -#: apt-pkg/contrib/fileutl.cc:452 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子程序 %s 收到一個記憶體錯誤" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子程序 %s 回傳錯誤碼(%u)" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子程序 %s 不預期的結束" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "無法開啟『%s』檔案。" -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "讀取，仍有 %lu 未讀" -#: apt-pkg/contrib/fileutl.cc:587 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但無法寫入" -#: apt-pkg/contrib/fileutl.cc:662 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "程式關閉檔案" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "程式刪除檔案" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "程式同步檔案" @@ -2753,68 +2753,79 @@ msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n" -#: apt-pkg/deb/dpkgpm.cc:452 +#: apt-pkg/deb/dpkgpm.cc:486 #, c-format msgid "Directory '%s' missing" msgstr "找不到 '%s' 目錄" -#: apt-pkg/deb/dpkgpm.cc:535 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Preparing %s" msgstr "準備配置%s中" -#: apt-pkg/deb/dpkgpm.cc:536 +#: apt-pkg/deb/dpkgpm.cc:570 #, c-format msgid "Unpacking %s" msgstr "解開%s中" -#: apt-pkg/deb/dpkgpm.cc:541 +#: apt-pkg/deb/dpkgpm.cc:575 #, c-format msgid "Preparing to configure %s" msgstr "準備設定%s檔" -#: apt-pkg/deb/dpkgpm.cc:542 +#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Configuring %s" msgstr "設定%s中" -#: apt-pkg/deb/dpkgpm.cc:544 apt-pkg/deb/dpkgpm.cc:545 +#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579 #, c-format msgid "Processing triggers for %s" msgstr "處理 %s 的啟動器" -#: apt-pkg/deb/dpkgpm.cc:547 +#: apt-pkg/deb/dpkgpm.cc:581 #, c-format msgid "Installed %s" msgstr "已安裝%s" -#: apt-pkg/deb/dpkgpm.cc:552 apt-pkg/deb/dpkgpm.cc:554 -#: apt-pkg/deb/dpkgpm.cc:555 +#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588 +#: apt-pkg/deb/dpkgpm.cc:589 #, c-format msgid "Preparing for removal of %s" msgstr "正在準備 %s 的刪除操作" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Removing %s" msgstr "移除%s中" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:592 #, c-format msgid "Removed %s" msgstr "已移除%s" -#: apt-pkg/deb/dpkgpm.cc:563 +#: apt-pkg/deb/dpkgpm.cc:597 #, c-format msgid "Preparing to completely remove %s" msgstr "準備完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:564 +#: apt-pkg/deb/dpkgpm.cc:598 #, c-format msgid "Completely removed %s" msgstr "已完整移除%s" -#: apt-pkg/deb/dpkgpm.cc:716 +#. populate the "processing" map +#: apt-pkg/deb/dpkgpm.cc:604 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "已安裝%s" + +#: apt-pkg/deb/dpkgpm.cc:607 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:756 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "無法寫入記錄檔，openpty()失敗(/dev/pts有掛載嗎？)\n" -- cgit v1.2.3 From e2c79929482ba04ed1a576e4bc837d434c71756e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Jul 2008 20:33:10 +0200 Subject: * add DPkg::NoTriggers option so that applications that call apt/aptitude (like the installer) defer trigger processing (thanks to Joey Hess) --- apt-pkg/deb/dpkgpm.cc | 3 +++ debian/changelog | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 77143e67..0071c151 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -554,6 +554,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) { unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); + bool NoTriggers = _config->FindB("DPkg::NoTriggers",false); if (RunScripts("DPkg::Pre-Invoke") == false) return false; @@ -689,6 +690,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) case Item::Configure: Args[n++] = "--configure"; + if (NoTriggers) + Args[n++] = "--no-triggers"; Size += strlen(Args[n-1]); break; diff --git a/debian/changelog b/debian/changelog index 35b447dd..1600fed9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,9 +19,11 @@ apt (0.7.15) UNRELEASED; urgency=low - when checking for new important deps, skip critical ones (closes: #485943) * improve apt progress reporting, display trigger actions + * add DPkg::NoTriggers option so that applications that call + apt/aptitude (like the installer) defer trigger processing + (thanks to Joey Hess) - - -- Christian Perrier Sat, 14 Jun 2008 07:39:06 +0200 + -- Michael Vogt Fri, 25 Jul 2008 20:31:05 +0200 apt (0.7.14) unstable; urgency=low -- cgit v1.2.3 From c76c44b10a40bc4ae755effad8a53802a6e4952a Mon Sep 17 00:00:00 2001 From: egon Date: Tue, 23 Sep 2008 07:31:23 +0200 Subject: * apt-pkg/pkgcachegen.cc: - do not add multiple identical descriptions for the same language (closes: #400768) --- apt-pkg/pkgcache.cc | 3 ++- apt-pkg/pkgcachegen.cc | 20 ++++++++++++++++---- debian/changelog | 8 ++++++++ 3 files changed, 26 insertions(+), 5 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 133899a2..8eb62089 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -622,7 +622,8 @@ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const for (; Desc.end() == false; Desc++) if (pkgIndexFile::LanguageCode() == Desc.LanguageCode()) break; - if (Desc.end() == true) Desc = DescDefault; + if (Desc.end() == true) + Desc = DescDefault; return Desc; }; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index d00cd4e6..f71547f3 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -139,10 +139,21 @@ bool pkgCacheGenerator::MergeList(ListParser &List, { pkgCache::DescIterator Desc = Ver.DescriptionList(); map_ptrloc *LastDesc = &Ver->DescriptionList; - - for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++) + bool duplicate=false; + + // don't add a new description if we have one for the given + // md5 && language + for ( ; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++) + if (MD5SumValue(Desc.md5()) == CurMd5 && + Desc.LanguageCode() == List.DescriptionLanguage()) + duplicate=true; + if(duplicate) + continue; + + for (Desc = Ver.DescriptionList(); + Desc.end() == false; + LastDesc = &Desc->NextDesc, Desc++) { - if (MD5SumValue(Desc.md5()) == CurMd5) { // Add new description @@ -434,7 +445,8 @@ 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, + const string &Lang, + const MD5SumValue &md5sum, map_ptrloc Next) { // Get a structure diff --git a/debian/changelog b/debian/changelog index 68ff35ef..1b3be907 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.15~exp2) experimental; urgency=low + + * apt-pkg/pkgcachegen.cc: + - do not add multiple identical descriptions for the same + language (closes: #400768) + + -- Michael Vogt Tue, 23 Sep 2008 07:29:59 +0200 + apt (0.7.15~exp1) experimental; urgency=low [ Christian Perrier ] -- cgit v1.2.3 From f7dec19f5ce3b876c5d2eaeb2d26cf513780c935 Mon Sep 17 00:00:00 2001 From: Daniel Burrows Date: Thu, 25 Sep 2008 18:24:09 -0700 Subject: Restore the apt ABI. The problem was that the size of pkgDpkgPM and its member offsets changed because a map giving the names of the trigger states was inserted into the middle of the structure. I fixed it by using a statically allocated array instead. This changes the procedure for looking up a string to a linear search, which should be fine (or even faster than before) since there are only 4 state strings. If it becomes a problem, sorting the array by key will allow us to use std::equal_range(), but I would advise against this unless it's really necessary, since sooner or later someone will forget to maintain the sort order. --- apt-pkg/deb/dpkgpm.cc | 51 ++++++++++++++++++++++++++++++++++++++++----------- apt-pkg/deb/dpkgpm.h | 2 -- debian/changelog | 12 ++++++++++++ 3 files changed, 52 insertions(+), 13 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 0071c151..70dd09bc 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include @@ -39,7 +41,38 @@ using namespace std; - +namespace +{ + // Maps the dpkg "processing" info to human readable names. Entry 0 + // of each array is the key, entry 1 is the value. + const std::pair PackageProcessingOps[] = { + std::make_pair("install", N_("Installing %s")), + std::make_pair("configure", N_("Configuring %s")), + std::make_pair("remove", N_("Removing %s")), + std::make_pair("trigproc", N_("Running post-installation trigger %s")) + }; + + const std::pair * const PackageProcessingOpsBegin = PackageProcessingOps; + const std::pair * const PackageProcessingOpsEnd = PackageProcessingOps + sizeof(PackageProcessingOps) / sizeof(PackageProcessingOps[0]); + + // Predicate to test whether an entry in the PackageProcessingOps + // array matches a string. + class MatchProcessingOp + { + const char *target; + + public: + MatchProcessingOp(const char *the_target) + : target(the_target) + { + } + + bool operator()(const std::pair &pair) const + { + return strcmp(pair.first, target) == 0; + } + }; +} // DPkgPM::pkgDPkgPM - Constructor /*{{{*/ // --------------------------------------------------------------------- @@ -362,17 +395,19 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) if(strncmp(list[0], "processing", strlen("processing")) == 0) { char s[200]; - map::iterator iter; char *pkg_or_trigger = _strstrip(list[2]); action =_strstrip( list[1]); - iter = PackageProcessingOps.find(action); - if(iter == PackageProcessingOps.end()) + const std::pair * const iter = + std::find_if(PackageProcessingOpsBegin, + PackageProcessingOpsEnd, + MatchProcessingOp(action)); + if(iter == PackageProcessingOpsEnd) { if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) std::clog << "ignoring unknwon action: " << action << std::endl; return; } - snprintf(s, sizeof(s), _(iter->second.c_str()), pkg_or_trigger); + snprintf(s, sizeof(s), _(iter->second), pkg_or_trigger); status << "pmstatus:" << pkg_or_trigger << ":" << (PackagesDone/float(PackagesTotal)*100.0) @@ -601,12 +636,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) }, }; - // populate the "processing" map - PackageProcessingOps.insert( make_pair("install",N_("Installing %s")) ); - PackageProcessingOps.insert( make_pair("configure",N_("Configuring %s")) ); - PackageProcessingOps.insert( make_pair("remove",N_("Removing %s")) ); - PackageProcessingOps.insert( make_pair("trigproc",N_("Running post-installation trigger %s")) ); - // init the PackageOps map, go over the list of packages that // that will be [installed|configured|removed|purged] and add // them to the PackageOps map (the dpkg states it goes through) diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 44946912..ebc7e32b 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -47,8 +47,6 @@ class pkgDPkgPM : public pkgPackageManager // the int is the state that is already done (e.g. a package that is // going to be install is already in state "half-installed") map PackageOpsDone; - // map the dpkg "processing" info to human readable names - map PackageProcessingOps; // progress reporting unsigned int PackagesDone; unsigned int PackagesTotal; diff --git a/debian/changelog b/debian/changelog index 5c381ab2..8913ef4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (UNRELEASED) experimental; urgency=low + + [Daniel Burrows] + * apt-pkg/deb/dpkgpm.cc: + - Store the trigger state descriptions in a way that does not break + the ABI. The approach taken makes the search for a string O(n) rather + than O(lg(n)), but since n == 4, I do not consider this a major + concern. If it becomes a concern, we can sort the static array and + use std::equal_range(). (Closes: #499322) + + -- + apt (0.7.15~exp2) experimental; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 496d5c709d9811f03b70ef0eaf6733c13d2564d2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 1 Oct 2008 18:35:23 +0200 Subject: * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc: - move the state file writting into the Go() implementation of dpkgpm (closes: #498799) * apt-pkg/algorithms.cc: - fix simulation performance drop (thanks to Ferenc Wagner for reporting the issue) --- apt-pkg/algorithms.cc | 3 ++- apt-pkg/algorithms.h | 1 + apt-pkg/deb/dpkgpm.cc | 2 ++ apt-pkg/packagemanager.cc | 4 ---- debian/changelog | 12 ++++++++++-- 5 files changed, 15 insertions(+), 7 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index eaab4c0e..59f994cd 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -37,7 +37,8 @@ pkgProblemResolver *pkgProblemResolver::This = 0; this is not necessary since the pkgCaches are fully shared now. */ pkgSimulate::pkgSimulate(pkgDepCache *Cache) : pkgPackageManager(Cache), iPolicy(Cache), - Sim(&Cache->GetCache(),&iPolicy) + Sim(&Cache->GetCache(),&iPolicy), + group(Sim) { Sim.Init(0); Flags = new unsigned char[Cache->Head().PackageCount]; diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index defaed57..d183cd21 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -60,6 +60,7 @@ class pkgSimulate : public pkgPackageManager Policy iPolicy; pkgDepCache Sim; + pkgDepCache::ActionGroup group; // The Actuall installation implementation virtual bool Install(PkgIterator Pkg,string File); diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 70dd09bc..4fad0fd5 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -956,6 +956,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) if (RunScripts("DPkg::Post-Invoke") == false) return false; + + Cache.writeStateFile(NULL); return true; } /*}}}*/ diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index c391a603..304d1c65 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -666,10 +666,6 @@ pkgPackageManager::DoInstallPostFork(int statusFd) if(goResult == false) return Failed; - // if all was fine update the state file - if(Res == Completed) { - Cache.writeStateFile(NULL); - } return Res; }; diff --git a/debian/changelog b/debian/changelog index 8913ef4b..796c5cff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (UNRELEASED) experimental; urgency=low +apt (0.7.15~exp3) UNRELEASED; urgency=low [Daniel Burrows] * apt-pkg/deb/dpkgpm.cc: @@ -8,7 +8,15 @@ apt (UNRELEASED) experimental; urgency=low concern. If it becomes a concern, we can sort the static array and use std::equal_range(). (Closes: #499322) - -- + [ Michael Vogt ] + * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc: + - move the state file writting into the Go() implementation + of dpkgpm (closes: #498799) + * apt-pkg/algorithms.cc: + - fix simulation performance drop (thanks to Ferenc Wagner + for reporting the issue) + + -- Michael Vogt Wed, 01 Oct 2008 18:09:49 +0200 apt (0.7.15~exp2) experimental; urgency=low -- cgit v1.2.3 From 7365ff46a3852e2d3abd2cfdfcfad37ac362c427 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 3 Oct 2008 20:15:06 +0200 Subject: Fix some typos in docs and translations (thanks to timeless, closes: 368665) --- COMPILING | 12 ++++++------ README.make | 16 ++++++++-------- apt-pkg/algorithms.cc | 2 +- apt-pkg/contrib/cmndline.h | 2 +- apt-pkg/contrib/strutl.cc | 2 +- apt-pkg/orderlist.cc | 2 +- buildlib/copy.mak | 2 +- debian/changelog | 3 ++- doc/ja/apt.ent.ja | 2 +- po/cy.po | 2 +- 10 files changed, 23 insertions(+), 22 deletions(-) (limited to 'apt-pkg') diff --git a/COMPILING b/COMPILING index fadbe171..5ea5e52d 100644 --- a/COMPILING +++ b/COMPILING @@ -9,14 +9,14 @@ To compile this you need a couple things g++ 2.8 works OK and newer egcs work well also. Nobody has tried it on other compilers :< You will need a properly working STL as well. - A C library with the usual POSIX functions and a BSD socket layer. - If you OS conforms to the Single Unix Spec then you are fine: + If your OS conforms to the Single Unix Spec then you are fine: http://www.opengroup.org/onlinepubs/7908799/index.html - Refer to the Build-Depends information in debian/control for additional requirements (some of which are Debian-specific) ** NOTICE ** The C++ global constructors do not link correctly when using non-shared -libaries. This is probably the correct behavior of the linker, but I have +libraries. This is probably the correct behavior of the linker, but I have not yet had time to devise a work around for it. The correct thing to do is add a reference to debSystem in apt-pkg/init.cc, assert(&debSystem == 0) would be fine for instance. @@ -29,7 +29,7 @@ I don't really care if your not-SUS OS doesn't work. It is simply too much work to maintain patches for dysfunctional OSs. I highly suggest you contact your vendor and express intrest in a conforming C library. -That said, there are lots of finniky problems that must be delt with even +That said, there are lots of finicky problems that must be dealt with even between the supported OS's. Primarily the path I choose to take is to put a shim header file in build/include that transparently adds the required functionality. Patches to make autoconf detect these cases and generate the @@ -39,12 +39,12 @@ Current shims: * C99 integer types 'inttypes.h' * sys/statvfs.h to convert from BSD/old-glibc statfs to SUS statvfs * rfc2553 hostname resolution (methods/rfc*), shims to normal gethostbyname. - The more adventerous could steal the KAME IPv6 enabled resolvers for those + The more adventurous could steal the KAME IPv6 enabled resolvers for those OS's with IPv6 support but no rfc2553 (why?) * define _XOPEN_EXTENDED_SOURCE to bring in h_errno on HP-UX * socklen_t shim in netdb.h if the OS does not have socklen_t -The only completely non-shimed OS is Linux with glibc2.1, glibc2.0 requires +The only completely non-shimmed OS is Linux with glibc2.1, glibc2.0 requires the first three shims. Platform Notes @@ -77,7 +77,7 @@ OpenBSD HP-UX HP-UX nyquist B.10.20 C 9000/780 2016574337 32-user license - Evil OS, does not conform very well to SUS - 1) snprintf exists but is not prototyped, ignore spurios warnings + 1) snprintf exists but is not prototyped, ignore spurious warnings 2) No socklen_t 3) Requires -D_XOPEN_SOURCE_EXTENDED for h_errno configure should fix the last two (see above) diff --git a/README.make b/README.make index c043f10f..69d79d37 100644 --- a/README.make +++ b/README.make @@ -36,12 +36,12 @@ cd into it to edit your source code! The make system also performs dependency generation on the fly as the compiler runs. This is extremely fast and accurate. There is however -one failure condition that occures when a header file is erased. In +one failure condition that occurs when a header file is erased. In this case you should run make clean to purge the .o and .d files to rebuild. -The final significant deviation from normal make practicies is -in how the build directory is managed. It is not mearly a mirror of +The final significant deviation from normal make practices is +in how the build directory is managed. It is not nearly a mirror of the source directory but is logically divided in the following manner bin/ methods/ @@ -51,12 +51,12 @@ the source directory but is logically divided in the following manner apt-pkg/ obj/ apt-pkg/ - cmndline/ + cmdline/ [...] Only .o and .d files are placed in the obj/ subdirectory. The final compiled binaries are placed in bin, published headers for inter-component linking are placed in include/ and documentation is generated into doc/. This means -all runnable programs are within the bin/ directory, a huge benifit for +all runnable programs are within the bin/ directory, a huge benefit for debugging inter-program relationships. The .so files are also placed in bin/ for simplicity. @@ -87,9 +87,9 @@ Autoconf ~~~~~~~~ Straight out of CVS you have to initialize autoconf. This requires automake (I really don't know why) and autoconf and requires doing - aclocal -I buidlib + aclocal -I buildlib autoconf -[Altertatively you can run make startup in the top level build dir] +[Alternatively you can run make startup in the top level build dir] Autoconf is configured to do some basic system probes for optional and required functionality and generate an environment.mak and include/config.h @@ -103,7 +103,7 @@ build include/ dir and perhaps writing some replacement code and linking it in. To the fullest extent possible the source code should conform to standards and not cater to broken systems. -Autoconf will also wite a makefile into the top level of the build dir, +Autoconf will also write a makefile into the top level of the build dir, this simply acts as a wrapper to the main top level make in the source tree. There is one big warning, you can't use both this make file and the ones in the top level tree. Make is not able to resolve rules that diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 59f994cd..2e2a976b 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -497,7 +497,7 @@ void pkgProblemResolver::MakeScores() signed short &Score = Scores[I->ID]; - /* This is arbitary, it should be high enough to elevate an + /* This is arbitrary, it should be high enough to elevate an essantial package above most other packages but low enough to allow an obsolete essential packages to be removed by a conflicts on a powerfull normal package (ie libc6) */ diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index fad6d1da..e28071e8 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -34,7 +34,7 @@ ConfigFile - Means this flag should be interprited as the name of a config file to read in at this point in option processing. Implies HasArg. - ArbItem - Means the item is an arbitary configuration string of + ArbItem - Means the item is an arbitrary configuration string of the form item=value, where item is passed directly to the configuration class. The default, if the flags are 0 is to use Boolean diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index eacc7077..3a0abc5a 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -461,7 +461,7 @@ string Base64Encode(const string &S) /*}}}*/ // stringcmp - Arbitary string compare /*{{{*/ // --------------------------------------------------------------------- -/* This safely compares two non-null terminated strings of arbitary +/* This safely compares two non-null terminated strings of arbitrary length */ int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd) { diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 616714e2..ca18f1d7 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -39,7 +39,7 @@ ordering. Each of the features can be enabled in the sorting routine at an - arbitary priority to give quite abit of control over the final unpacking + arbitrary priority to give quite abit of control over the final unpacking order. The rules listed above may never be violated and are called Critical. diff --git a/buildlib/copy.mak b/buildlib/copy.mak index 15f44882..3ae11a7e 100644 --- a/buildlib/copy.mak +++ b/buildlib/copy.mak @@ -1,6 +1,6 @@ # -*- make -*- -# This installs arbitary files into a directory +# This installs arbitrary files into a directory # Input # $(SOURCE) - The documents to use diff --git a/debian/changelog b/debian/changelog index 09087421..72c4f9c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apt (0.7.15~exp4) UNRELEASED; urgency=low - * + [Luca Bruno] + * Fix some typos in docs and translations (thanks to timeless, closes: 368665) -- Luca Bruno Fri, 03 Oct 2008 20:00:18 +0200 diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja index 3fa931ae..d6334246 100644 --- a/doc/ja/apt.ent.ja +++ b/doc/ja/apt.ent.ja @@ -296,7 +296,7 @@ diff --git a/po/cy.po b/po/cy.po index ba949eb7..fcc70d42 100644 --- a/po/cy.po +++ b/po/cy.po @@ -251,7 +251,7 @@ msgstr "" " -q Disable progress indicator.\n" " -i Show only important deps for the unmet command.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\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" #: cmdline/apt-cdrom.cc:78 -- cgit v1.2.3 From 0da8987ab9e67ad693e38bb5cfe692f12b1a7db9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 3 Oct 2008 20:57:25 +0200 Subject: Applying #298821 patch for further arbitary typos --- apt-pkg/contrib/cmndline.cc | 2 +- apt-pkg/contrib/strutl.cc | 4 ++-- debian/changelog | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 54c91d67..bfd53695 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -189,7 +189,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[], if ((A->Flags & ConfigFile) == ConfigFile) return ReadConfigFile(*Conf,Argument); - // Arbitary item specification + // Arbitrary item specification if ((A->Flags & ArbItem) == ArbItem) { const char *J; diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 3a0abc5a..bd374fd1 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -459,7 +459,7 @@ string Base64Encode(const string &S) return Final; } /*}}}*/ -// stringcmp - Arbitary string compare /*{{{*/ +// stringcmp - Arbitrary string compare /*{{{*/ // --------------------------------------------------------------------- /* This safely compares two non-null terminated strings of arbitrary length */ @@ -517,7 +517,7 @@ int stringcmp(string::const_iterator A,string::const_iterator AEnd, } #endif /*}}}*/ -// stringcasecmp - Arbitary case insensitive string compare /*{{{*/ +// stringcasecmp - Arbitrary case insensitive string compare /*{{{*/ // --------------------------------------------------------------------- /* */ int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd) diff --git a/debian/changelog b/debian/changelog index d8c2b571..d3c34a13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ apt (0.7.15~exp4) UNRELEASED; urgency=low [Luca Bruno] * Fix some typos in docs and translations - (thanks to timeless, closes: #368665) + (thanks to timeless and Nicolas Bonifas, closes: #368665, #298821) * Document apt-key finger and adv commands (thanks to Stefan Schmidt, closes: #350575) * Better documentation on using both APT::Default-Release and -- cgit v1.2.3 From 2ec1674d7d0c0cd77fb385d16bf8db98968e3e84 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 11 Oct 2008 09:22:43 +0200 Subject: Fix compilation warning in apt-pkg/acquire.cc. New experimental release --- apt-pkg/acquire.cc | 2 +- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'apt-pkg') diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 6840ae12..80c2fee0 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -796,7 +796,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) // Compute the CPS struct timeval NewTime; gettimeofday(&NewTime,0); - if (NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec || + if ((NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec) || NewTime.tv_sec - Time.tv_sec > 6) { double Delta = NewTime.tv_sec - Time.tv_sec + diff --git a/debian/changelog b/debian/changelog index 0bb4fcdd..9f73c25c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.17~exp1) UNRELEASED; urgency=low + + [ Luca Bruno ] + * apt-pkg/acquire.cc: + - fix a compilation warning + + -- Luca Bruno Sat, 11 Oct 2008 09:17:46 +0200 + apt (0.7.16) unstable; urgency=low [ Luca Bruno ] -- cgit v1.2.3 From d320fdc3539f686e690a4ae0cb3f941b0e1a0456 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 11 Oct 2008 09:42:17 +0200 Subject: Fix another compilation warning in apt-pkg/versionmatch.cc --- apt-pkg/versionmatch.cc | 2 +- debian/changelog | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 4a426809..5c25c2f7 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -124,7 +124,7 @@ bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix) const char *Ae = Ab + strlen(A); // Strings are not a compatible size. - if ((unsigned)(Ae - Ab) != B.length() && Prefix == false || + if (((unsigned)(Ae - Ab) != B.length() && Prefix == false) || (unsigned)(Ae - Ab) < B.length()) return false; diff --git a/debian/changelog b/debian/changelog index 9f73c25c..b88df66a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ apt (0.7.17~exp1) UNRELEASED; urgency=low [ Luca Bruno ] - * apt-pkg/acquire.cc: - - fix a compilation warning + * Fix compilation warnings: + - apt-pkg/acquire.cc + - apt-pkg/versionmatch.cc -- Luca Bruno Sat, 11 Oct 2008 09:17:46 +0200 -- cgit v1.2.3 From f8b1274722522826650a37f87bf9e743b5bca337 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 11 Oct 2008 10:48:59 +0200 Subject: Fix typo in apt-pkg/depcache.cc --- apt-pkg/depcache.cc | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'apt-pkg') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index d8b4dc6d..859e64ea 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1001,7 +1001,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if(Pkg.Section() && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", Pkg.Section())) { if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) - std::clog << "Setting NOT as auto-installed (direct dep of pkg in APT::Never-MarkAuto-Section)" << std::endl; + std::clog << "Setting NOT as auto-installed (direct dep of pkg in APT::Never-MarkAuto-Sections)" << std::endl; MarkInstall(InstPkg,true,Depth + 1, true); } else diff --git a/debian/changelog b/debian/changelog index e0fd3be8..afce5000 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ apt (0.7.17~exp1) UNRELEASED; urgency=low [ Luca Bruno ] + * Fix typos: + - apt-pkg/depcache.cc * Fix compilation warnings: - apt-pkg/acquire.cc - apt-pkg/versionmatch.cc -- cgit v1.2.3 From 0d7a243df522cad460bc1f94f32c6b7f766cabb1 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 25 Oct 2008 01:33:40 +0300 Subject: Added fallback to uncompressed files while acquiring index files (Sources and Packages) --- apt-pkg/acquire-item.cc | 25 +++++++++++++++++++------ debian/changelog | 9 +++++++++ 2 files changed, 28 insertions(+), 6 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 7cae6c8b..b014092d 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -570,7 +570,7 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, } else { CompressionExtension = comprExt; } - Desc.URI = URI + CompressionExtension; + Desc.URI = URI + (CompressionExtension == "plain" ? "" : CompressionExtension); Desc.Description = URIDesc; Desc.Owner = this; @@ -597,19 +597,30 @@ string pkgAcqIndex::Custom600Headers() void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { + bool descChanged = false; // no .bz2 found, retry with .gz if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") { - Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; + Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; - // retry with a gzip one - new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, + new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, ExpectedHash, string(".gz")); + descChanged = true; + } + // no .gz found, retry with uncompressed + else if(Desc.URI.substr(Desc.URI.size()-2) == "gz") { + Desc.URI = Desc.URI.substr(0,Desc.URI.size()-2); + + new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, + ExpectedHash, string("plain")); + descChanged = true; + } + if (descChanged) { Status = StatDone; Complete = false; Dequeue(); return; - } - + } + // on decompression failure, remove bad versions in partial/ if(Decompression && Erase) { string s = _config->FindDir("Dir::State::lists") + "partial/"; @@ -706,6 +717,8 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, decompProg = "bzip2"; else if(compExt == ".gz") decompProg = "gzip"; + else if(compExt == "ges" || compExt == "ces") // packaGES or sourCES + decompProg = "copy"; else { _error->Error("Unsupported extension: %s", compExt.c_str()); return; diff --git a/debian/changelog b/debian/changelog index 0bb4fcdd..5c2c5f29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.7.17) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * apt-pkg/acquire-item.cc: + - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz' + available. (Closes: #409284) + + -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 + apt (0.7.16) unstable; urgency=low [ Luca Bruno ] -- cgit v1.2.3 From 4805f1cfd795c41db2a3c7fed56c15bb8c350c49 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 25 Oct 2008 17:03:16 +0300 Subject: Strip user/password from URL in error message. --- apt-pkg/algorithms.cc | 18 +++++++++++++++++- debian/changelog | 3 +++ 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'apt-pkg') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 2e2a976b..bd59a474 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -1342,7 +1343,22 @@ bool ListUpdate(pkgAcquireStatus &Stat, (*I)->Finished(); - _error->Warning(_("Failed to fetch %s %s\n"),(*I)->DescURI().c_str(), + // stripping username/password from URI if present + string descUri = (*I)->DescURI(); + regex_t userPassRegex; + regcomp(&userPassRegex, "\\://(\\w+)\\:(\\w+)@", REG_EXTENDED); + regmatch_t userPassMatch; + regexec(&userPassRegex, descUri.c_str(), 1, &userPassMatch, 0); + if (userPassMatch.rm_so != -1) // regexp matched + { + // really stripping + size_t stripStart = userPassMatch.rm_so + 3; + size_t stripEnd = userPassMatch.rm_eo; + descUri = descUri.substr(0, stripStart) + + descUri.substr(stripEnd, string::npos); + } + + _error->Warning(_("Failed to fetch %s %s\n"), descUri.c_str(), (*I)->ErrorText.c_str()); if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError) diff --git a/debian/changelog b/debian/changelog index 5c2c5f29..40e1cc23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ apt (0.7.17) unstable; urgency=low * apt-pkg/acquire-item.cc: - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz' available. (Closes: #409284) + * apt-pkg/algorithm.cc: + - Strip username and password from source URL in error message. + (Closes: #425150) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 -- cgit v1.2.3 From 27d5a2046999b86605968e7cbf0778dd95e63371 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 25 Oct 2008 22:15:20 +0300 Subject: Fixed error output when fallback'ed to uncompressed Packages/Sources. --- apt-pkg/acquire-item.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index b014092d..503ad7da 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -568,9 +568,9 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, else CompressionExtension = ".gz"; } else { - CompressionExtension = comprExt; + CompressionExtension = (comprExt == "plain" ? "" : comprExt); } - Desc.URI = URI + (CompressionExtension == "plain" ? "" : CompressionExtension); + Desc.URI = URI + CompressionExtension; Desc.Description = URIDesc; Desc.Owner = this; -- cgit v1.2.3 From 2d6f9accbcf38923911854a918d971c0905b262c Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 25 Oct 2008 22:49:22 +0300 Subject: Corrected determining if regexp matched. --- apt-pkg/algorithms.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index bd59a474..6f30a52d 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1348,8 +1348,8 @@ bool ListUpdate(pkgAcquireStatus &Stat, regex_t userPassRegex; regcomp(&userPassRegex, "\\://(\\w+)\\:(\\w+)@", REG_EXTENDED); regmatch_t userPassMatch; - regexec(&userPassRegex, descUri.c_str(), 1, &userPassMatch, 0); - if (userPassMatch.rm_so != -1) // regexp matched + int regMatchResult = regexec(&userPassRegex, descUri.c_str(), 1, &userPassMatch, 0); + if (regMatchResult == 0 && userPassMatch.rm_so != -1) // regexp matched { // really stripping size_t stripStart = userPassMatch.rm_so + 3; @@ -1357,6 +1357,7 @@ bool ListUpdate(pkgAcquireStatus &Stat, descUri = descUri.substr(0, stripStart) + descUri.substr(stripEnd, string::npos); } + regfree(&userPassRegex); _error->Warning(_("Failed to fetch %s %s\n"), descUri.c_str(), (*I)->ErrorText.c_str()); -- cgit v1.2.3 From c94e518c5ee831c21063ce38e6446113db087456 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 26 Oct 2008 13:39:10 +0200 Subject: Switched from regexp to using existing URI class to strip user/password. --- apt-pkg/algorithms.cc | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 6f30a52d..70212e5c 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1343,21 +1343,10 @@ bool ListUpdate(pkgAcquireStatus &Stat, (*I)->Finished(); - // stripping username/password from URI if present - string descUri = (*I)->DescURI(); - regex_t userPassRegex; - regcomp(&userPassRegex, "\\://(\\w+)\\:(\\w+)@", REG_EXTENDED); - regmatch_t userPassMatch; - int regMatchResult = regexec(&userPassRegex, descUri.c_str(), 1, &userPassMatch, 0); - if (regMatchResult == 0 && userPassMatch.rm_so != -1) // regexp matched - { - // really stripping - size_t stripStart = userPassMatch.rm_so + 3; - size_t stripEnd = userPassMatch.rm_eo; - descUri = descUri.substr(0, stripStart) + - descUri.substr(stripEnd, string::npos); - } - regfree(&userPassRegex); + ::URI uri((*I)->DescURI()); + uri.User.clear(); + uri.Password.clear(); + string descUri = string(uri); _error->Warning(_("Failed to fetch %s %s\n"), descUri.c_str(), (*I)->ErrorText.c_str()); -- cgit v1.2.3 From 4b94b383390fb93c58fb14460679fadbb3c8ee93 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 26 Oct 2008 13:41:09 +0200 Subject: Forgot to remove regex.h include in previous commit. Now done --- apt-pkg/algorithms.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'apt-pkg') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 70212e5c..1d04ae64 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include #include -- cgit v1.2.3